This commit is contained in:
huayanYu 2023-10-23 21:03:29 +08:00
parent 03c7cffec0
commit 7994897b25
5 changed files with 15 additions and 25 deletions

View File

@ -25,7 +25,6 @@ import com.baomidou.dynamic.datasource.provider.YmlDynamicDataSourceProvider;
import com.baomidou.dynamic.datasource.strategy.DynamicDataSourceStrategy; import com.baomidou.dynamic.datasource.strategy.DynamicDataSourceStrategy;
import com.baomidou.dynamic.datasource.tx.DsTxEventListenerFactory; import com.baomidou.dynamic.datasource.tx.DsTxEventListenerFactory;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

View File

@ -37,20 +37,16 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT) @SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT)
public class DsTransactionalTest { public class DsTransactionalTest {
@Autowired
private OrderService orderService;
@Autowired
private AccountService accountService;
@Autowired
private ProductService productService;
@Autowired @Autowired
DataSource dataSource; DataSource dataSource;
@Autowired @Autowired
DefaultDataSourceCreator dataSourceCreator; DefaultDataSourceCreator dataSourceCreator;
@Autowired
private OrderService orderService;
@Autowired
private AccountService accountService;
@Autowired
private ProductService productService;
private DynamicRoutingDataSource ds; private DynamicRoutingDataSource ds;
@Test @Test

View File

@ -37,20 +37,16 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
@SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT) @SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT)
public class DsTransactionalTest { public class DsTransactionalTest {
@Autowired
private OrderService orderService;
@Autowired
private AccountService accountService;
@Autowired
private ProductService productService;
@Autowired @Autowired
DataSource dataSource; DataSource dataSource;
@Autowired @Autowired
DefaultDataSourceCreator dataSourceCreator; DefaultDataSourceCreator dataSourceCreator;
@Autowired
private OrderService orderService;
@Autowired
private AccountService accountService;
@Autowired
private ProductService productService;
private DynamicRoutingDataSource ds; private DynamicRoutingDataSource ds;
@Test @Test

View File

@ -268,9 +268,9 @@ public class DynamicRoutingDataSource extends AbstractRoutingDataSource implemen
/** /**
* close db * close db
* *
* @param ds dsName * @param ds dsName
* @param dataSource db * @param dataSource db
* @param graceDestroy If true, close the connection after a delay. * @param graceDestroy If true, close the connection after a delay.
*/ */
private void closeDataSource(String ds, DataSource dataSource, boolean graceDestroy) { private void closeDataSource(String ds, DataSource dataSource, boolean graceDestroy) {
try { try {

View File

@ -27,7 +27,6 @@ import java.util.Objects;
/** /**
* DsTxListenerMethodAdapter Referenced from org.springframework.transaction.event.TransactionalApplicationListenerMethodAdapter * DsTxListenerMethodAdapter Referenced from org.springframework.transaction.event.TransactionalApplicationListenerMethodAdapter
*
*/ */
public class DsTxListenerMethodAdapter extends ApplicationListenerMethodAdapter { public class DsTxListenerMethodAdapter extends ApplicationListenerMethodAdapter {
private final DsTxEventListener dsTxEventListener; private final DsTxEventListener dsTxEventListener;