fix($MBP): change datasource name back to master-slave form

Mybatis-Plus doesn't support non-master-slave datasource yet. see com.baomidou.dynamic.datasource.support.DdConstants
johnnymillergh · Sep 26, 2021 · aeb6b02 · aeb6b02
1 parent 2fd8e6f
commit aeb6b02
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...rc/main/java/com/jmsoftware/maf/springcloudstarter/database/MyBatisPlusConfiguration.java b/...rc/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() {