diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml index 23a83c60..4a2b300a 100644 --- a/auth-center/src/main/resources/application-development-docker.yml +++ b/auth-center/src/main/resources/application-development-docker.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml index 6dad16a3..bb71a0af 100644 --- a/auth-center/src/main/resources/application-development-local.yml +++ b/auth-center/src/main/resources/application-development-local.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://localhost:3307/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml index 305c0411..92a642e5 100644 --- a/auth-center/src/main/resources/application-production.yml +++ b/auth-center/src/main/resources/application-production.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml index 305c0411..92a642e5 100644 --- a/auth-center/src/main/resources/application-stage.yml +++ b/auth-center/src/main/resources/application-stage.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml index 9165b362..b000d2aa 100644 --- a/auth-center/src/main/resources/application-test.yml +++ b/auth-center/src/main/resources/application-test.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml index 6ae94403..eaf4fcb1 100644 --- a/auth-center/src/main/resources/application.yml +++ b/auth-center/src/main/resources/application.yml @@ -42,7 +42,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource dynamic: - primary: source_1 + primary: master_1 druid: # connection pool size will be determined by DruidDataSourceCreatorPostProcessor.java max-wait: 60000 diff --git a/maf-mis/src/main/resources/application-development-docker.yml b/maf-mis/src/main/resources/application-development-docker.yml index 23a83c60..4a2b300a 100644 --- a/maf-mis/src/main/resources/application-development-docker.yml +++ b/maf-mis/src/main/resources/application-development-docker.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/maf-mis/src/main/resources/application-development-local.yml b/maf-mis/src/main/resources/application-development-local.yml index 1235cd33..3795c984 100644 --- a/maf-mis/src/main/resources/application-development-local.yml +++ b/maf-mis/src/main/resources/application-development-local.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://localhost:3307/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/maf-mis/src/main/resources/application-production.yml b/maf-mis/src/main/resources/application-production.yml index 305c0411..92a642e5 100644 --- a/maf-mis/src/main/resources/application-production.yml +++ b/maf-mis/src/main/resources/application-production.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/maf-mis/src/main/resources/application-stage.yml b/maf-mis/src/main/resources/application-stage.yml index 305c0411..92a642e5 100644 --- a/maf-mis/src/main/resources/application-stage.yml +++ b/maf-mis/src/main/resources/application-stage.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/maf-mis/src/main/resources/application-test.yml b/maf-mis/src/main/resources/application-test.yml index 9165b362..b000d2aa 100644 --- a/maf-mis/src/main/resources/application-test.yml +++ b/maf-mis/src/main/resources/application-test.yml @@ -6,12 +6,12 @@ spring: datasource: dynamic: datasource: - source_1: + master_1: url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_rw password: maf@mysql driver-class-name: com.mysql.cj.jdbc.Driver - replica_1: + slave_1: url: jdbc:mysql://maf-mysql-server-replica-1:3306/muscle_and_fitness?useSSL=true&useUnicode=true username: maf_mysql_r password: maf@mysql diff --git a/maf-mis/src/main/resources/application.yml b/maf-mis/src/main/resources/application.yml index ac253141..133928f2 100644 --- a/maf-mis/src/main/resources/application.yml +++ b/maf-mis/src/main/resources/application.yml @@ -44,7 +44,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource dynamic: - primary: source_1 + primary: master_1 druid: # connection pool size will be determined by DruidDataSourceCreatorPostProcessor.java max-wait: 60000 diff --git a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java index dca0e939..3868bea0 100644 --- a/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java +++ b/spring-cloud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java @@ -1,6 +1,7 @@ package com.jmsoftware.maf.springcloudstarter.database; import com.baomidou.dynamic.datasource.plugin.MasterSlaveAutoRoutingPlugin; +import com.baomidou.dynamic.datasource.support.DdConstants; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -9,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.ibatis.plugin.Interceptor; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,11 +25,12 @@ **/ @Slf4j @Configuration +@EnableTransactionManagement @Import({ DataSourceConfiguration.class }) +@MapperScan("com.jmsoftware.maf.springcloudstarter.*.mapper") @ConditionalOnClass({MybatisPlusAutoConfiguration.class}) -@EnableTransactionManagement public class MyBatisPlusConfiguration { @Bean public PaginationInnerInterceptor paginationInnerInterceptor() { @@ -62,6 +65,13 @@ public Interceptor mybatisPlusInterceptor(PaginationInnerInterceptor paginationI return mybatisPlusInterceptor; } + /** + * Register master-slave auto routing plugin interceptor. Mybatis-Plus doesn't support non-master-slave + * datasource yet. + * + * @return the interceptor + * @see DdConstants + */ @Bean @Order(2) public Interceptor masterSlaveAutoRoutingPlugin() {