Merge remote-tracking branch 'origin/master'

bonus-common-biz/src/main/java/com/bonus/mq/rabbit/tx/MessageManagerConfiguration.java

@@ -21,20 +21,20 @@ public class MessageManagerConfiguration {
    @Configuration
    @ConditionalOnMissingBean({TxMessageManager.class})
    static class DataSourceMessageManagerConfiguration {
-      @Configuration
-      @ConditionalOnMissingBean({DataSource.class})
-      static class DefaultMessageManagerConfigure {
-         @Bean
-         public TxMessageManager messageManager() {
-            return new DefaultTxMessageManager();
-         }
-      }
+//      @Configuration
+//      @ConditionalOnMissingBean({DataSource.class})
+//      static class DefaultMessageManagerConfigure {
+//         @Bean
+//         public TxMessageManager messageManager() {
+//            return new DefaultTxMessageManager();
+//         }
+//      }
 
       @Configuration
-      @ConditionalOnBean({DataSource.class})
+//      @ConditionalOnBean({DataSource.class})
       static class DataSourceMessageManagerConfigure {
          @Configuration
-         @ConditionalOnMissingClass({"net.xnzn.framework.data.dataset.datasource.RoutingDataSource"})
+//         @ConditionalOnMissingClass({"net.xnzn.framework.data.dataset.datasource.RoutingDataSource"})
          static class DefaultDataSourceMessageManagerConfigure {
             @Bean
             public TxMessageManager messageManager(DataSource dataSource) {