Commit a8836dd9 by huluobin

# update

parent 077bf334
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
<artifactId>ebaycalls</artifactId> <artifactId>ebaycalls</artifactId>
<version>1065</version> <version>1065</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-task</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
package com.bailuntec.job; package com.bailuntec.job;
import com.zaxxer.hikari.HikariConfig; import org.springframework.boot.context.properties.ConfigurationProperties;
import com.zaxxer.hikari.HikariDataSource; import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource; import javax.sql.DataSource;
...@@ -19,22 +19,19 @@ import javax.sql.DataSource; ...@@ -19,22 +19,19 @@ import javax.sql.DataSource;
@Configuration @Configuration
public class DataSourceConfig { public class DataSourceConfig {
@Value("${spring.datasource.url}")
String url;
@Value("${spring.datasource.username}")
String username;
@Value("${spring.datasource.password}")
String password;
@Value("${spring.datasource.driver-class-name}")
String driverClassName;
@Bean @Bean
public DataSource dataSource() { @ConfigurationProperties(prefix = "spring.dataflow-datasource")
HikariConfig hikariConfig = new HikariConfig(); public DataSource dataflowDataSource() {
hikariConfig.setDriverClassName(driverClassName); return DataSourceBuilder.create().build();
hikariConfig.setJdbcUrl(url);
hikariConfig.setUsername(username);
hikariConfig.setPassword(password);
return new HikariDataSource(hikariConfig);
} }
@Primary
@Bean
@ConfigurationProperties(prefix = "spring.dataflow")
public DataSource bizDataSource() {
return DataSourceBuilder.create().build();
}
} }
package com.bailuntec.job; package com.bailuntec.job;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
...@@ -19,9 +18,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; ...@@ -19,9 +18,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableScheduling @EnableScheduling
@ComponentScan("com.bailuntec") @ComponentScan("com.bailuntec")
@EnableFeignClients(basePackages = {"com.bailuntec.api", "com.bailuntec.*.api"}) @EnableFeignClients(basePackages = {"com.bailuntec.api", "com.bailuntec.*.api"})
public class EbayFinanceJob { public class EbayFinanceTaskApp {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(EbayFinanceJob.class, args); SpringApplication.run(EbayFinanceTaskApp.class, args);
} }
} }
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 javax.sql.DataSource;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/21 9:31 上午
*/
@Configuration
public class GeneratorTaskConfigurer extends DefaultTaskConfigurer {
public GeneratorTaskConfigurer(@Qualifier("dataflowDataSource") DataSource dataSource) {
super(dataSource);
}
}
...@@ -8,6 +8,13 @@ spring: ...@@ -8,6 +8,13 @@ spring:
username: root username: root
password: '#7kfnymAM$Y9-Ntf' password: '#7kfnymAM$Y9-Ntf'
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
dataflow-dataSource:
url: jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT}/mysql
username: root
password: ${mysql-root-password}
driverClassName: org.mariadb.jdbc.Driver
testOnBorrow: true
validationQuery: "SELECT 1"
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
batch: batch:
......
...@@ -4,7 +4,12 @@ spring: ...@@ -4,7 +4,12 @@ spring:
name: base-sync-ebay name: base-sync-ebay
# 数据配置 # 数据配置
datasource: datasource:
url: jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datecenter_test?serverTimezone=GMT%2B8&characterEncoding=utf-8&rewriteBatchedStatements=true jdbcUrl: jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datecenter_test?serverTimezone=GMT%2B8&characterEncoding=utf-8&rewriteBatchedStatements=true
username: root
password: '#7kfnymAM$Y9-Ntf'
driver-class-name: com.mysql.jdbc.Driver
dataflow-dataSource:
jdbcUrl: jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datecenter_test?serverTimezone=GMT%2B8&characterEncoding=utf-8&rewriteBatchedStatements=true
username: root username: root
password: '#7kfnymAM$Y9-Ntf' password: '#7kfnymAM$Y9-Ntf'
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
......
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