diff --git a/Dockerfile b/Dockerfile index 9f63349c86..70dec5f209 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ RUN mkdir -p /opt/dataease/data/feature/full ADD mapFiles/* /opt/dataease/data/feature/full/ +RUN mkdir -p /opt/dataease/drivers + +ADD drivers/* /opt/dataease/drivers/ + ADD backend/target/backend-$IMAGE_TAG.jar /opt/apps ENV JAVA_APP_JAR=/opt/apps/backend-$IMAGE_TAG.jar diff --git a/backend/pom.xml b/backend/pom.xml index 56c47df966..9a85199e0a 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -229,29 +229,19 @@ 8.3.0.7-683 - c3p0 - c3p0 - 0.9.1.2 - - - com.oracle.database.jdbc - ojdbc8 - 12.2.0.1 - - - ru.yandex.clickhouse - clickhouse-jdbc - 0.3.1 - - - com.microsoft.sqlserver - mssql-jdbc - 7.4.1.jre8 - - - org.postgresql - postgresql - 42.2.14 + com.alibaba + druid + 1.2.8 + + + com.alibaba + jconsole + + + com.alibaba + tools + + @@ -365,33 +355,33 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - main-class-placement - generate-resources - - - - - - - - - - - - - - - - run - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java b/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java index 1d052de8cc..bb178bacfe 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java @@ -18,8 +18,4 @@ public class JdbcConfiguration { private int initialPoolSize = 5; private int minPoolSize = 5; private int maxPoolSize = 50; - private int maxIdleTime = 30; - private int acquireIncrement = 5; - private int idleConnectionTestPeriod = 5; - private int connectTimeout = 5; } diff --git a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java index 958427294e..fdc7357de5 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; @Setter public class MysqlConfiguration extends JdbcConfiguration { - private String driver = "com.mysql.cj.jdbc.Driver"; + private String driver = "com.mysql.jdbc.Driver"; private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true"; public String getJdbc() { diff --git a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java index 69948926f0..3f955ab781 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -2,7 +2,6 @@ package io.dataease.datasource.provider; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.mchange.v2.c3p0.ComboPooledDataSource; import io.dataease.commons.utils.HttpClientConfig; import io.dataease.commons.utils.HttpClientUtil; import io.dataease.datasource.dto.*; @@ -24,9 +23,6 @@ import java.util.*; @Service("es") public class EsProvider extends DatasourceProvider { - private static Map jdbcConnection = new HashMap<>(); - private static int initPoolSize = 5; - private static int maxConnections = 200; /** * 增加缓存机制 key 由 'provider_sql_' dsr.datasource.id dsr.table dsr.query共4部分组成，命中则使用缓存直接返回不再执行sql逻辑 diff --git a/backend/src/main/java/io/dataease/datasource/provider/ExtendedJdbcClassLoader.java b/backend/src/main/java/io/dataease/datasource/provider/ExtendedJdbcClassLoader.java new file mode 100644 index 0000000000..f8e93c329c --- /dev/null +++ b/backend/src/main/java/io/dataease/datasource/provider/ExtendedJdbcClassLoader.java @@ -0,0 +1,97 @@ +package io.dataease.datasource.provider; + + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +public class ExtendedJdbcClassLoader extends URLClassLoader { + + public ExtendedJdbcClassLoader(URL[] urls) { + super(urls); + } + + @Override + protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + synchronized (getClassLoadingLock(name)) { + // First, check if the class has already been loaded + Class c = findLoadedClass(name); + + if (c != null) { + if (resolve) { + resolveClass(c); + } + return c; + } + try { + c = findClass(name); + if (c != null) { + if (resolve) { + resolveClass(c); + } + return c; + } + } catch (ClassNotFoundException e) { + // Ignore + } + + + try { + if (getParent() != null) { + c = super.loadClass(name, resolve); + if (c != null) { + if (resolve) { + resolveClass(c); + } + return c; + } + } + } catch (ClassNotFoundException e) { + // Ignore + } + try { + c = findSystemClass(name); + if (c != null) { + if (resolve) { + resolveClass(c); + } + return c; + } + } catch (ClassNotFoundException e) { + // Ignore + } + throw new ClassNotFoundException(name); + } + } + + + @Override + protected Package getPackage(String name) { + return null; + } + + + public void addFile(String s) throws IOException { + File f = new File(s); + addFile(f); + } + + public void addFile(File f) throws IOException { + addFile(f.toURI().toURL()); + } + + public void addFile(URL u) throws IOException { + try { + this.addURL(u); + } catch (Throwable t) { + t.printStackTrace(); + throw new IOException("Error, could not add URL to system classloader"); + } + } + + public static synchronized ExtendedJdbcClassLoader getExtJdbcClassLoader(String path) throws Exception{ + File file = new File(path); + ExtendedJdbcClassLoader extendedJdbcClassLoader = new ExtendedJdbcClassLoader(new URL[]{file.toURI().toURL()}); + return extendedJdbcClassLoader; + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index 5bfb421d63..b8eb1e5b4d 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -1,7 +1,7 @@ package io.dataease.datasource.provider; +import com.alibaba.druid.pool.DruidDataSource; import com.google.gson.Gson; -import com.mchange.v2.c3p0.ComboPooledDataSource; import io.dataease.datasource.constants.DatasourceTypes; import io.dataease.datasource.dto.*; import io.dataease.datasource.request.DatasourceRequest; @@ -10,16 +10,41 @@ import io.dataease.i18n.Translator; import io.dataease.provider.QueryProvider; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; import java.beans.PropertyVetoException; +import java.io.File; +import java.io.IOException; +import java.net.URL; import java.sql.*; import java.util.*; @Service("jdbc") public class JdbcProvider extends DatasourceProvider { - private static Map jdbcConnection = new HashMap<>(); + private static Map jdbcConnection = new HashMap<>(); + private static Map extendedJdbcClassLoaderHashMap = new HashMap<>(); private static int initPoolSize = 5; private static int maxConnections = 200; + private ExtendedJdbcClassLoader extendedJdbcClassLoader; + static private String FILE_PATH = "/opt/dataease/drivers"; + @PostConstruct + public void init() throws Exception{ + extendedJdbcClassLoader = new ExtendedJdbcClassLoader(new URL[]{new File(FILE_PATH).toURI().toURL()}); + File file = new File(FILE_PATH); + File[] array = file.listFiles(); + Optional.ofNullable(array).ifPresent(files -> { + for (File tmp : array) { + if (tmp.getName().endsWith(".jar")) { + try { + extendedJdbcClassLoader.addFile(tmp); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + }); + } /** * 增加缓存机制 key 由 'provider_sql_' dsr.datasource.id dsr.table dsr.query共4部分组成，命中则使用缓存直接返回不再执行sql逻辑 @@ -267,53 +292,6 @@ public class JdbcProvider extends DatasourceProvider { return new ArrayList<>(); } -// @Override -// public List getTableFileds(DatasourceRequest datasourceRequest) throws Exception { -// List list = new LinkedList<>(); -// Connection connection = null; -// ResultSet resultSet = null; -// try { -// connection = getConnectionFromPool(datasourceRequest); -// DatabaseMetaData databaseMetaData = connection.getMetaData(); -// resultSet = databaseMetaData.getColumns(null, "%", datasourceRequest.getTable(), "%"); -// while (resultSet.next()) { -// String tableName = resultSet.getString("TABLE_NAME"); -// String database = null; -// if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name())){ -// database = resultSet.getString("TABLE_SCHEM"); -// }else { -// database = resultSet.getString("TABLE_CAT"); -// } -// if(database != null){ -// if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { -// TableFiled tableFiled = getTableFiled(resultSet, datasourceRequest); -// list.add(tableFiled); -// } -// }else { -// if (tableName.equals(datasourceRequest.getTable())) { -// TableFiled tableFiled = getTableFiled(resultSet, datasourceRequest); -// list.add(tableFiled); -// } -// } -// } -// resultSet.close(); -// -// Statement stat = connection.createStatement(); -// resultSet = stat.executeQuery(datasourceRequest.getQuery()); -// return fetchResultField(resultSet, datasourceRequest); -// -// -// } catch (SQLException e) { -// DataEaseException.throwException(e); -// } catch (Exception e) { -// DataEaseException.throwException(e); -// } finally { -// if(connection != null){ -// connection.close(); -// } -// } -// return list; -// } private TableFiled getTableFiled(ResultSet resultSet, DatasourceRequest datasourceRequest) throws SQLException { TableFiled tableFiled = new TableFiled(); @@ -358,8 +336,6 @@ public class JdbcProvider extends DatasourceProvider { } } - - public Long count(DatasourceRequest datasourceRequest) throws Exception { Connection con = null; try { @@ -378,7 +354,7 @@ public class JdbcProvider extends DatasourceProvider { } private Connection getConnectionFromPool(DatasourceRequest datasourceRequest) throws Exception { - ComboPooledDataSource dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId()); + DruidDataSource dataSource = jdbcConnection.get(datasourceRequest.getDatasource().getId()); if (dataSource == null) { handleDatasource(datasourceRequest, "add"); } @@ -389,7 +365,7 @@ public class JdbcProvider extends DatasourceProvider { @Override public void handleDatasource(DatasourceRequest datasourceRequest, String type) throws Exception { - ComboPooledDataSource dataSource = null; + DruidDataSource dataSource = null; switch (type){ case "add": checkStatus(datasourceRequest); @@ -418,28 +394,15 @@ public class JdbcProvider extends DatasourceProvider { } private void addToPool(DatasourceRequest datasourceRequest) throws PropertyVetoException { - ComboPooledDataSource dataSource; - dataSource = new ComboPooledDataSource(); + DruidDataSource dataSource = new DruidDataSource(); JdbcConfiguration jdbcConfiguration = setCredential(datasourceRequest, dataSource); - dataSource.setMaxIdleTime(jdbcConfiguration.getMaxIdleTime()); // 最大空闲时间 - dataSource.setAcquireIncrement(jdbcConfiguration.getAcquireIncrement());// 增长数 - dataSource.setInitialPoolSize(jdbcConfiguration.getInitialPoolSize());// 初始连接数 - dataSource.setMinPoolSize(jdbcConfiguration.getMinPoolSize()); // 最小连接数 - dataSource.setMaxPoolSize(jdbcConfiguration.getMaxPoolSize()); // 最大连接数 - dataSource.setAcquireRetryAttempts(30);// 获取连接重试次数 - dataSource.setIdleConnectionTestPeriod(60); // 每60s检查数据库空闲连接 - dataSource.setMaxStatements(0); // c3p0全局的PreparedStatements缓存的大小 - dataSource.setBreakAfterAcquireFailure(false); // 获取连接失败将会引起所有等待连接池来获取连接的线程抛出异常。但是数据源仍有效保留，并在下次调用getConnection()的时候继续尝试获取连接。如果设为true，那么在尝试获取连接失败后该数据源将申明已断开并永久关闭。Default: false - dataSource.setTestConnectionOnCheckout(false); // 在每个connection 提交是校验有效性 - dataSource.setTestConnectionOnCheckin(true); // 取得连接的同时将校验连接的有效性 - dataSource.setCheckoutTimeout(60000); // 从连接池获取连接的超时时间，如设为0则无限期等待。单位毫秒，默认为0 -// dataSource.setPreferredTestQuery("SELECT 1"); - dataSource.setDebugUnreturnedConnectionStackTraces(true); - dataSource.setUnreturnedConnectionTimeout(3600); + dataSource.setInitialSize(jdbcConfiguration.getInitialPoolSize());// 初始连接数 + dataSource.setMinIdle(jdbcConfiguration.getMinPoolSize()); // 最小连接数 + dataSource.setMaxActive(jdbcConfiguration.getMaxPoolSize()); // 最大连接数 jdbcConnection.put(datasourceRequest.getDatasource().getId(), dataSource); } - private static Connection getConnection(DatasourceRequest datasourceRequest) throws Exception { + private Connection getConnection(DatasourceRequest datasourceRequest) throws Exception { String username = null; String password = null; String driver = null; @@ -471,7 +434,6 @@ public class JdbcProvider extends DatasourceProvider { driver = oracleConfiguration.getDriver(); jdbcurl = oracleConfiguration.getJdbc(); props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ; -// props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ; break; case pg: PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); @@ -491,16 +453,18 @@ public class JdbcProvider extends DatasourceProvider { break; } - Class.forName(driver); + Driver driverClass = (Driver) extendedJdbcClassLoader.loadClass(driver).newInstance(); props.setProperty("user", username); if (StringUtils.isNotBlank(password)) { props.setProperty("password", password); } - return DriverManager.getConnection(jdbcurl, props); + + Connection conn = driverClass.connect(jdbcurl, props); + return conn; } - private JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, ComboPooledDataSource dataSource) throws PropertyVetoException { + private JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, DruidDataSource dataSource) throws PropertyVetoException { DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType()); JdbcConfiguration jdbcConfiguration = new JdbcConfiguration(); switch (datasourceType) { @@ -509,42 +473,42 @@ public class JdbcProvider extends DatasourceProvider { case de_doris: case ds_doris: MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfiguration.class); - dataSource.setUser(mysqlConfiguration.getUsername()); - dataSource.setDriverClass(mysqlConfiguration.getDriver()); + dataSource.setUsername(mysqlConfiguration.getUsername()); + dataSource.setDriverClassLoader(extendedJdbcClassLoader); dataSource.setPassword(mysqlConfiguration.getPassword()); - dataSource.setJdbcUrl(mysqlConfiguration.getJdbc()); + dataSource.setUrl(mysqlConfiguration.getJdbc()); jdbcConfiguration = mysqlConfiguration; break; case sqlServer: SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); - dataSource.setUser(sqlServerConfiguration.getUsername()); - dataSource.setDriverClass(sqlServerConfiguration.getDriver()); + dataSource.setUsername(sqlServerConfiguration.getUsername()); + dataSource.setDriverClassLoader(extendedJdbcClassLoader); dataSource.setPassword(sqlServerConfiguration.getPassword()); - dataSource.setJdbcUrl(sqlServerConfiguration.getJdbc()); + dataSource.setUrl(sqlServerConfiguration.getJdbc()); jdbcConfiguration = sqlServerConfiguration; break; case oracle: OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); - dataSource.setUser(oracleConfiguration.getUsername()); - dataSource.setDriverClass(oracleConfiguration.getDriver()); + dataSource.setUsername(oracleConfiguration.getUsername()); + dataSource.setDriverClassLoader(extendedJdbcClassLoader); dataSource.setPassword(oracleConfiguration.getPassword()); - dataSource.setJdbcUrl(oracleConfiguration.getJdbc()); + dataSource.setUrl(oracleConfiguration.getJdbc()); jdbcConfiguration = oracleConfiguration; break; case pg: PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); - dataSource.setUser(pgConfiguration.getUsername()); - dataSource.setDriverClass(pgConfiguration.getDriver()); + dataSource.setUsername(pgConfiguration.getUsername()); + dataSource.setDriverClassLoader(extendedJdbcClassLoader); dataSource.setPassword(pgConfiguration.getPassword()); - dataSource.setJdbcUrl(pgConfiguration.getJdbc()); + dataSource.setUrl(pgConfiguration.getJdbc()); jdbcConfiguration = pgConfiguration; break; case ck: CHConfiguration chConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfiguration.class); - dataSource.setUser(chConfiguration.getUsername()); - dataSource.setDriverClass(chConfiguration.getDriver()); + dataSource.setUsername(chConfiguration.getUsername()); + dataSource.setDriverClassLoader(extendedJdbcClassLoader); dataSource.setPassword(chConfiguration.getPassword()); - dataSource.setJdbcUrl(chConfiguration.getJdbc()); + dataSource.setUrl(chConfiguration.getJdbc()); jdbcConfiguration = chConfiguration; break; default: diff --git a/drivers/clickhouse-jdbc-0.3.1.jar b/drivers/clickhouse-jdbc-0.3.1.jar new file mode 100644 index 0000000000..9d299ab8e2 Binary files /dev/null and b/drivers/clickhouse-jdbc-0.3.1.jar differ diff --git a/drivers/httpmime-4.5.13.jar b/drivers/httpmime-4.5.13.jar new file mode 100644 index 0000000000..cc52f44a3a Binary files /dev/null and b/drivers/httpmime-4.5.13.jar differ diff --git a/drivers/lz4-java-1.7.1.jar b/drivers/lz4-java-1.7.1.jar new file mode 100644 index 0000000000..95f57ca102 Binary files /dev/null and b/drivers/lz4-java-1.7.1.jar differ diff --git a/drivers/mysql-connector-java-5.1.46.jar b/drivers/mysql-connector-java-5.1.46.jar new file mode 100644 index 0000000000..6d26d72246 Binary files /dev/null and b/drivers/mysql-connector-java-5.1.46.jar differ diff --git a/drivers/ojdbc8-12.2.0.1.jar b/drivers/ojdbc8-12.2.0.1.jar new file mode 100644 index 0000000000..bf412434bd Binary files /dev/null and b/drivers/ojdbc8-12.2.0.1.jar differ diff --git a/drivers/postgresql-42.2.14.jar b/drivers/postgresql-42.2.14.jar new file mode 100644 index 0000000000..47cebaba4d Binary files /dev/null and b/drivers/postgresql-42.2.14.jar differ diff --git a/drivers/sqljdbc4-4.0.jar b/drivers/sqljdbc4-4.0.jar new file mode 100644 index 0000000000..d6b7f6daf4 Binary files /dev/null and b/drivers/sqljdbc4-4.0.jar differ diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index 1c17f14c4c..f4914b3e53 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -87,15 +87,6 @@ - - - - - - - - - @@ -229,8 +220,7 @@ export default { this.$message.error(this.$t('datasource.port_no_less_then_0')) return } - if (this.form.configuration.initialPoolSize < 0 || this.form.configuration.minPoolSize < 0 || this.form.configuration.maxPoolSize < 0 || this.form.configuration.maxIdleTime < 0 || - this.form.configuration.acquireIncrement < 0 || this.form.configuration.idleConnectionTestPeriod < 0 || this.form.configuration.connectTimeout < 0) { + if (this.form.configuration.initialPoolSize < 0 || this.form.configuration.minPoolSize < 0 || this.form.configuration.maxPoolSize < 0) { this.$message.error(this.$t('datasource.no_less_then_0')) return }