diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java index 678a713..0502fc5 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java @@ -1,6 +1,5 @@ package com.muyu.cloud.etl.service.impl; -import com.muyu.Hikari.HikariPool; import com.muyu.cloud.etl.service.ProductService; import com.muyu.cloud.etl.service.SourceService; import com.muyu.cloud.etl.service.TableInfoService; @@ -8,6 +7,7 @@ import com.muyu.domain.DataValue; import com.muyu.domain.Source; import com.muyu.domain.TableInfo; import com.muyu.domain.enums.DataType; +import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -487,18 +487,18 @@ public int addProduct(Long basicId, Long tableId, DataValue[][] listList) { TableInfo tableInfo = tableInfoService.getById(tableId); String tableName = tableInfo.getTableName(); -// HikariConfig hikariConfig = new HikariConfig(); -// hikariConfig.setPoolName("HikariCP 连接池"); -// hikariConfig.setDriverClassName(dataSources.getDriverName()); -// // hikariConfig.setJdbcUrl(dataSources.getUrl(dataSources) + "&maxAllowedPacket=1G"); -// hikariConfig.setJdbcUrl(dataSources.getUrl()); -// hikariConfig.setUsername(dataSources.getUsername()); -// hikariConfig.setPassword(dataSources.getPassword()); -// hikariConfig.setMinimumIdle(2); -// hikariConfig.setMaximumPoolSize(10); -// + HikariConfig hikariConfig = new HikariConfig(); + hikariConfig.setPoolName("HikariCP 连接池"); + hikariConfig.setDriverClassName(dataSources.getDriverName()); + // hikariConfig.setJdbcUrl(dataSources.getUrl(dataSources) + "&maxAllowedPacket=1G"); + hikariConfig.setJdbcUrl(dataSources.getUrl()); + hikariConfig.setUsername(dataSources.getUsername()); + hikariConfig.setPassword(dataSources.getPassword()); + hikariConfig.setMinimumIdle(2); + hikariConfig.setMaximumPoolSize(10); + HikariDataSource hikariDataSource = new HikariDataSource(hikariConfig); - HikariDataSource hikariDataSource = HikariPool.getHikariDataSource(dataSources); +// HikariDataSource hikariDataSource = HikariPool.getHikariDataSource(dataSources); ExecutorService executorService = Executors.newFixedThreadPool(8); AtomicInteger addCount = new AtomicInteger();