* 条件替换

bes2008 · Jan 15, 2021 · 7507caf · 7507caf
1 parent ed68b7b
commit 7507caf
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 32 deletions.
diff --git a/sqlhelper-examples/sqlhelper-examples-db/src/main/resources/test.h2.db b/sqlhelper-examples/sqlhelper-examples-db/src/main/resources/test.h2.db
diff --git a/...lper/mybatis/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java b/...lper/mybatis/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java
@@ -36,15 +36,20 @@ public class DynamicDataSourceTransactionFactoryCustomizer implements Configurat
     public void customize(Configuration configuration) {
         Environment oldEnv = configuration.getEnvironment();
         if (oldEnv != null) {
-            String id = oldEnv.getId();
-            DataSource dataSource = oldEnv.getDataSource();
-            if (dataSource instanceof NamedDataSource) {
-                id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
-            }
 
-            TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
-            Environment newEnv = new Environment(id, transactionFactory, dataSource);
-            configuration.setEnvironment(newEnv);
+            boolean replaceIt = oldEnv.getTransactionFactory() == null || !(oldEnv.getTransactionFactory() instanceof DynamicDataSourceManagedTransactionFactory);
+            if (replaceIt) {
+
+                String id = oldEnv.getId();
+                DataSource dataSource = oldEnv.getDataSource();
+                if (dataSource instanceof NamedDataSource) {
+                    id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
+                }
+
+                TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
+                Environment newEnv = new Environment(id, transactionFactory, dataSource);
+                configuration.setEnvironment(newEnv);
+            }
         }
     }
 }
diff --git a/.../mybatisplus/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java b/.../mybatisplus/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java
@@ -39,15 +39,18 @@ public class DynamicDataSourceTransactionFactoryCustomizer implements Configurat
     public void customize(MybatisConfiguration configuration) {
         Environment oldEnv = configuration.getEnvironment();
         if (oldEnv != null) {
-            String id = oldEnv.getId();
-            DataSource dataSource = oldEnv.getDataSource();
-            if (dataSource instanceof NamedDataSource) {
-                id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
-            }
+            boolean replaceIt = oldEnv.getTransactionFactory() == null || !(oldEnv.getTransactionFactory() instanceof DynamicDataSourceManagedTransactionFactory);
+            if(replaceIt) {
+                String id = oldEnv.getId();
+                DataSource dataSource = oldEnv.getDataSource();
+                if (dataSource instanceof NamedDataSource) {
+                    id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
+                }
 
-            TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
-            Environment newEnv = new Environment(id, transactionFactory, dataSource);
-            configuration.setEnvironment(newEnv);
+                TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
+                Environment newEnv = new Environment(id, transactionFactory, dataSource);
+                configuration.setEnvironment(newEnv);
+            }
         }
     }
 }
diff --git a/...ybatisplus2x/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java b/...ybatisplus2x/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java
@@ -39,15 +39,18 @@ public class DynamicDataSourceTransactionFactoryCustomizer implements Configurat
     public void customize(Configuration configuration) {
         Environment oldEnv = configuration.getEnvironment();
         if (oldEnv != null) {
-            String id = oldEnv.getId();
-            DataSource dataSource = oldEnv.getDataSource();
-            if (dataSource instanceof NamedDataSource) {
-                id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
-            }
+            boolean replaceIt = oldEnv.getTransactionFactory() == null || !(oldEnv.getTransactionFactory() instanceof DynamicDataSourceManagedTransactionFactory);
+            if(replaceIt) {
+                String id = oldEnv.getId();
+                DataSource dataSource = oldEnv.getDataSource();
+                if (dataSource instanceof NamedDataSource) {
+                    id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
+                }
 
-            TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
-            Environment newEnv = new Environment(id, transactionFactory, dataSource);
-            configuration.setEnvironment(newEnv);
+                TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
+                Environment newEnv = new Environment(id, transactionFactory, dataSource);
+                configuration.setEnvironment(newEnv);
+            }
         }
     }
 }
diff --git a/...per/tkmapper/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java b/...per/tkmapper/spring/boot/autoconfigure/DynamicDataSourceTransactionFactoryCustomizer.java
@@ -40,15 +40,18 @@ public class DynamicDataSourceTransactionFactoryCustomizer implements Configurat
     public void customize(Configuration configuration) {
         Environment oldEnv = configuration.getEnvironment();
         if (oldEnv != null) {
-            String id = oldEnv.getId();
-            DataSource dataSource = oldEnv.getDataSource();
-            if (dataSource instanceof NamedDataSource) {
-                id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
-            }
+            boolean replaceIt = oldEnv.getTransactionFactory() == null || !(oldEnv.getTransactionFactory() instanceof DynamicDataSourceManagedTransactionFactory);
+            if (replaceIt) {
+                String id = oldEnv.getId();
+                DataSource dataSource = oldEnv.getDataSource();
+                if (dataSource instanceof NamedDataSource) {
+                    id = ((NamedDataSource) dataSource).getDataSourceKey().getId();
+                }
 
-            TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
-            Environment newEnv = new Environment(id, transactionFactory, dataSource);
-            configuration.setEnvironment(newEnv);
+                TransactionFactory transactionFactory = new DynamicDataSourceManagedTransactionFactory();
+                Environment newEnv = new Environment(id, transactionFactory, dataSource);
+                configuration.setEnvironment(newEnv);
+            }
         }
     }
 }