From cb6f077d335cb51c9b236183f6db4e0fe0575768 Mon Sep 17 00:00:00 2001 From: Yunfei Du <278774021@qq.com> Date: Sun, 19 May 2024 18:05:10 +0800 Subject: [PATCH] =?UTF-8?q?feat()=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96(RabbitMq)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/etl/Main.java | 7 +++ .../client/config/DataAccessClientRunner.java | 48 ++++++++----------- .../etl-data-source-server/pom.xml | 11 +++++ .../etl/data/ETLDataSourceApplication.java | 2 + .../src/main/resources/bootstrap.yml | 12 +++++ etl-modules/etl-data-unit/pom.xml | 11 +++++ .../etl/data/unit/DataUnitApplication.java | 2 + .../src/main/resources/bootstrap.yml | 4 ++ 8 files changed, 70 insertions(+), 27 deletions(-) create mode 100644 etl-common/etl-common-data-standard/src/main/java/com/etl/Main.java diff --git a/etl-common/etl-common-data-standard/src/main/java/com/etl/Main.java b/etl-common/etl-common-data-standard/src/main/java/com/etl/Main.java new file mode 100644 index 0000000..f2c72b1 --- /dev/null +++ b/etl-common/etl-common-data-standard/src/main/java/com/etl/Main.java @@ -0,0 +1,7 @@ +package com.etl; + +public class Main { + public static void main(String[] args) { + System.out.println ( "Hello world!" ); + } +} diff --git a/etl-modules/etl-data-source/etl-data-source-client/src/main/java/com/etl/data/client/config/DataAccessClientRunner.java b/etl-modules/etl-data-source/etl-data-source-client/src/main/java/com/etl/data/client/config/DataAccessClientRunner.java index 936b323..9ec3139 100644 --- a/etl-modules/etl-data-source/etl-data-source-client/src/main/java/com/etl/data/client/config/DataAccessClientRunner.java +++ b/etl-modules/etl-data-source/etl-data-source-client/src/main/java/com/etl/data/client/config/DataAccessClientRunner.java @@ -1,9 +1,4 @@ package com.etl.data.client.config; - -import com.alibaba.druid.pool.DruidPooledConnection; -import com.etl.data.client.connPool.service.ConnPoolManagementService; -import com.etl.data.domain.DataSource; -import com.etl.data.domain.req.DataSourceQueryReq; import com.etl.data.source.remote.RemoteDataSourceService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -28,27 +23,26 @@ public class DataAccessClientRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) { - List< DataSource > dataSourceList = remoteDataSourceService.getDataSourceList ( new DataSourceQueryReq ( ) ).getData ( ).getRows ( ); - if (!dataSourceList.isEmpty ()){ - ConnPoolManagementService.init ( dataSourceList ); - - try { - DruidPooledConnection druidPooledConnection = ConnPoolManagementService.get ( dataSourceList.get ( 0 ).getKey ( ) ); -// Map< DruidPooledConnection, String > connToKey = ConnPoolManagementService.getConnToKey ( ); - log.info ( "connToKey:{}", druidPooledConnection ); - -// JDBCConcreteClass jdbcConcreteClass = new JDBCConcreteClass ( ); -// PreparedStatement preparedStatement = jdbcConcreteClass.getPreparedStatement ( connection, "select * from car" ); -// ResultSetMetaData rsd = preparedStatement.getMetaData ( ); -// for (int i = 1; i <= rsd.getColumnCount ( ); i++) { -// log.info ( "类型:{}", rsd.getColumnClassName ( i ) ); -// } - - ConnPoolManagementService.returnConnection ( druidPooledConnection ); - } catch (Exception e) { - log.error ( "数据访问客户端运行程序异常:{}", e.getMessage ( ) ); - throw new RuntimeException ( e ); - } - } +// List< DataSource > dataSourceList = remoteDataSourceService.getDataSourceList ( new DataSourceQueryReq ( ) ).getData ( ).getRows ( ); +// if (!dataSourceList.isEmpty ()){ +// ConnPoolManagementService.init ( dataSourceList ); +// try { +// DruidPooledConnection druidPooledConnection = ConnPoolManagementService.get ( dataSourceList.get ( 0 ).getKey ( ) ); +//// Map< DruidPooledConnection, String > connToKey = ConnPoolManagementService.getConnToKey ( ); +//// log.info ( "connToKey:{}", druidPooledConnection ); +// +//// JDBCConcreteClass jdbcConcreteClass = new JDBCConcreteClass ( ); +//// PreparedStatement preparedStatement = jdbcConcreteClass.getPreparedStatement ( connection, "select * from car" ); +//// ResultSetMetaData rsd = preparedStatement.getMetaData ( ); +//// for (int i = 1; i <= rsd.getColumnCount ( ); i++) { +//// log.info ( "类型:{}", rsd.getColumnClassName ( i ) ); +//// } +// +// ConnPoolManagementService.returnConnection ( druidPooledConnection ); +// } catch (Exception e) { +// log.error ( "数据访问客户端运行程序异常:{}", e.getMessage ( ) ); +// throw new RuntimeException ( e ); +// } +// } } } diff --git a/etl-modules/etl-data-source/etl-data-source-server/pom.xml b/etl-modules/etl-data-source/etl-data-source-server/pom.xml index e084228..e853fb5 100644 --- a/etl-modules/etl-data-source/etl-data-source-server/pom.xml +++ b/etl-modules/etl-data-source/etl-data-source-server/pom.xml @@ -18,6 +18,17 @@ + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.cloud + spring-cloud-starter-zipkin + 2.2.8.RELEASE + com.alibaba.cloud diff --git a/etl-modules/etl-data-source/etl-data-source-server/src/main/java/com/etl/data/ETLDataSourceApplication.java b/etl-modules/etl-data-source/etl-data-source-server/src/main/java/com/etl/data/ETLDataSourceApplication.java index 9545f48..346ca24 100644 --- a/etl-modules/etl-data-source/etl-data-source-server/src/main/java/com/etl/data/ETLDataSourceApplication.java +++ b/etl-modules/etl-data-source/etl-data-source-server/src/main/java/com/etl/data/ETLDataSourceApplication.java @@ -6,6 +6,7 @@ import com.etl.common.swagger.annotation.EnableCustomSwagger2; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.transaction.annotation.EnableTransactionManagement; /** * 数据源模块 @@ -16,6 +17,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication +@EnableTransactionManagement @MapperScan("com.etl.data.mapper") public class ETLDataSourceApplication { public static void main (String[] args) { diff --git a/etl-modules/etl-data-source/etl-data-source-server/src/main/resources/bootstrap.yml b/etl-modules/etl-data-source/etl-data-source-server/src/main/resources/bootstrap.yml index 4160fb2..5d43482 100644 --- a/etl-modules/etl-data-source/etl-data-source-server/src/main/resources/bootstrap.yml +++ b/etl-modules/etl-data-source/etl-data-source-server/src/main/resources/bootstrap.yml @@ -4,6 +4,18 @@ server: # Spring spring: + zipkin: + base-url: http://111.229.102.61:9411 + sender: + type: web + rabbitmq: + host: 43.142.44.217 + username: guest + password: guest + virtualhost: / + port: 5672 + publisher-confirm-type: correlated + publisher-returns: true main: allow-circular-references: true application: diff --git a/etl-modules/etl-data-unit/pom.xml b/etl-modules/etl-data-unit/pom.xml index f614d8f..34bf0e1 100644 --- a/etl-modules/etl-data-unit/pom.xml +++ b/etl-modules/etl-data-unit/pom.xml @@ -18,6 +18,17 @@ + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.cloud + spring-cloud-starter-zipkin + 2.2.8.RELEASE + com.etl etl-data-source-client diff --git a/etl-modules/etl-data-unit/src/main/java/com/etl/data/unit/DataUnitApplication.java b/etl-modules/etl-data-unit/src/main/java/com/etl/data/unit/DataUnitApplication.java index fa98de0..782f63e 100644 --- a/etl-modules/etl-data-unit/src/main/java/com/etl/data/unit/DataUnitApplication.java +++ b/etl-modules/etl-data-unit/src/main/java/com/etl/data/unit/DataUnitApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; /** * @ClassName DataUnitApplication @@ -18,6 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +@EnableTransactionManagement @EnableAsync public class DataUnitApplication { public static void main(String[] args) { diff --git a/etl-modules/etl-data-unit/src/main/resources/bootstrap.yml b/etl-modules/etl-data-unit/src/main/resources/bootstrap.yml index 669e0e3..ad1f302 100644 --- a/etl-modules/etl-data-unit/src/main/resources/bootstrap.yml +++ b/etl-modules/etl-data-unit/src/main/resources/bootstrap.yml @@ -4,6 +4,10 @@ server: # Spring spring: + zipkin: + base-url: http://111.229.102.61:9411 + sender: + type: web main: allow-circular-references: true application: