diff --git a/springboot3-sample/pom.xml b/springboot3-sample/pom.xml index 47c9228..7b98bb1 100644 --- a/springboot3-sample/pom.xml +++ b/springboot3-sample/pom.xml @@ -15,7 +15,7 @@ 11 11 UTF-8 - 3.1.0 + 3.1.1 @@ -34,13 +34,19 @@ com.baomidou - dynamic-datasource-spring-boot-starter + dynamic-datasource-spring-boot3-starter + 4.1.1 org.mybatis.spring.boot mybatis-spring-boot-starter 3.0.2 + + com.alibaba + druid-spring-boot-3-starter + 1.2.18 + com.h2database h2 diff --git a/springboot3-sample/src/main/java/com/baomidou/sample/boot3/SpringBoot3Application.java b/springboot3-sample/src/main/java/com/baomidou/sample/boot3/SpringBoot3Application.java index 19ff811..fce0cc1 100644 --- a/springboot3-sample/src/main/java/com/baomidou/sample/boot3/SpringBoot3Application.java +++ b/springboot3-sample/src/main/java/com/baomidou/sample/boot3/SpringBoot3Application.java @@ -15,14 +15,14 @@ */ package com.baomidou.sample.boot3; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @Slf4j -@SpringBootApplication +@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class) @MapperScan("com.baomidou.sample.boot3.mapper") public class SpringBoot3Application { diff --git a/springboot3-sample/src/main/java/com/baomidou/sample/boot3/service/impl/UserServiceImpl.java b/springboot3-sample/src/main/java/com/baomidou/sample/boot3/service/impl/UserServiceImpl.java index 7e8ae39..6c50658 100644 --- a/springboot3-sample/src/main/java/com/baomidou/sample/boot3/service/impl/UserServiceImpl.java +++ b/springboot3-sample/src/main/java/com/baomidou/sample/boot3/service/impl/UserServiceImpl.java @@ -16,7 +16,7 @@ package com.baomidou.sample.boot3.service.impl; -import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.annotation.Slave; import com.baomidou.sample.boot3.entity.User; import com.baomidou.sample.boot3.mapper.UserMapper; import com.baomidou.sample.boot3.service.UserService; @@ -36,7 +36,7 @@ public List selectMasterUsers() { return userMapper.selectUsers(); } - @DS("#header.ds") + @Slave @Override public List selectSlaveUsers() { return userMapper.selectUsers(); diff --git a/springboot3-sample/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springboot3-sample/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ee2e6c1 --- /dev/null +++ b/springboot3-sample/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure \ No newline at end of file diff --git a/springboot3-sample/src/main/resources/application.yml b/springboot3-sample/src/main/resources/application.yml index 8beeb11..bff3cb2 100644 --- a/springboot3-sample/src/main/resources/application.yml +++ b/springboot3-sample/src/main/resources/application.yml @@ -1,5 +1,10 @@ spring: datasource: + druid: + stat-view-servlet: + enabled: true + login-username: admin + login-password: 123456 dynamic: datasource: master: