Commit 726771ef by huluobin

# update

parent 93ef2b68
package com.bailuntec.job;
import com.zaxxer.hikari.HikariDataSource;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
......@@ -29,15 +29,12 @@ public class DataSourceConfig {
@Bean
public DataSource dataflowDataSource() {
DataSourceProperties dataSourceProperties = dataflowDataSourceProperties();
return DataSourceBuilder
.create(dataSourceProperties.getClassLoader())
public DataSource dataflowDataSource(@Qualifier("dataflowDataSourceProperties") DataSourceProperties dataSourceProperties) {
return DataSourceBuilder.create()
.driverClassName(dataSourceProperties.getDriverClassName())
.url(dataSourceProperties.getUrl())
.username(dataSourceProperties.getUsername())
.password(dataSourceProperties.getPassword())
.type(HikariDataSource.class)
.build();
}
......@@ -51,15 +48,13 @@ public class DataSourceConfig {
@Primary
@Bean
public DataSource bizDataSource() {
DataSourceProperties dataSourceProperties = bizDataSourceProperties();
public DataSource bizDataSource(@Qualifier("bizDataSourceProperties") DataSourceProperties dataSourceProperties) {
return DataSourceBuilder
.create(dataSourceProperties.getClassLoader())
.create()
.driverClassName(dataSourceProperties.getDriverClassName())
.url(dataSourceProperties.getUrl())
.username(dataSourceProperties.getUsername())
.password(dataSourceProperties.getPassword())
.type(HikariDataSource.class)
.build();
}
......
......@@ -35,8 +35,8 @@ public class EbayJobListener extends JobExecutionListenerSupport {
if (jobExecution.getStatus() == BatchStatus.COMPLETED) {
log.info("!!! JOB FINISHED! Time to verify the results");
}
if (jobExecution.getStatus() == BatchStatus.FAILED) {
//todo 任务失败提醒推送
log.error("!!! JOB FAILED");
......
......@@ -3,6 +3,7 @@ package com.bailuntec.job;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.cloud.task.configuration.DefaultTaskConfigurer;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
......@@ -14,7 +15,7 @@ import javax.sql.DataSource;
* @author robbendev
* @since 2021/1/21 9:31 上午
*/
@Configuration
@Component
public class GeneratorTaskConfigurer extends DefaultTaskConfigurer {
public GeneratorTaskConfigurer(@Qualifier("dataflowDataSource") DataSource dataSource) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment