diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/DruidSpringBootStarterApplication.java similarity index 82% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/DruidSpringBootStarterApplication.java index 174de9c..cd5f3d6 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/DruidSpringBootStarterApplication.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/DruidSpringBootStarterApplication.java @@ -1,6 +1,6 @@ -package com.github.trang.druid; +package com.github.trang.druid.example; -import com.github.trang.druid.mapper.CityMapper; +import com.github.trang.druid.example.mapper.CityMapper; import com.google.gson.Gson; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; @@ -14,8 +14,8 @@ import org.springframework.context.ApplicationContext; * * @author trang */ -@SpringBootApplication -@MapperScan("com.github.trang.druid.mapper") +@SpringBootApplication(scanBasePackages = "com.github.trang.druid.example") +@MapperScan("com.github.trang.druid.example.mapper") public class DruidSpringBootStarterApplication implements CommandLineRunner { public static void main(String[] args) { diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/DynamicDataSource.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/DynamicDataSource.java similarity index 96% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/DynamicDataSource.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/DynamicDataSource.java index c7672df..3c6e573 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/DynamicDataSource.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.github.trang.druid.config; +package com.github.trang.druid.example.config; import lombok.Getter; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/SpringDataSourceConfig.java similarity index 95% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/SpringDataSourceConfig.java index 5dbf1f7..9f0a8d0 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/config/SpringDataSourceConfig.java @@ -1,4 +1,4 @@ -package com.github.trang.druid.config; +package com.github.trang.druid.example.config; import com.alibaba.druid.pool.DruidDataSource; import lombok.extern.slf4j.Slf4j; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/controller/CityController.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/controller/CityController.java similarity index 71% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/controller/CityController.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/controller/CityController.java index a52e6a3..c3fc8b4 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/controller/CityController.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/controller/CityController.java @@ -1,7 +1,7 @@ -package com.github.trang.druid.controller; +package com.github.trang.druid.example.controller; -import com.github.trang.druid.mapper.CityMapper; -import com.github.trang.druid.model.City; +import com.github.trang.druid.example.mapper.CityMapper; +import com.github.trang.druid.example.model.City; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/mapper/CityMapper.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mapper/CityMapper.java similarity index 80% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/mapper/CityMapper.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mapper/CityMapper.java index a672094..55da1c1 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/mapper/CityMapper.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mapper/CityMapper.java @@ -1,6 +1,6 @@ -package com.github.trang.druid.mapper; +package com.github.trang.druid.example.mapper; -import com.github.trang.druid.model.City; +import com.github.trang.druid.example.model.City; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/model/City.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/model/City.java similarity index 95% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/model/City.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/model/City.java index f931029..468108a 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/model/City.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/model/City.java @@ -1,4 +1,4 @@ -package com.github.trang.druid.model; +package com.github.trang.druid.example.model; import java.io.Serializable; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml index dd19745..0c60b6c 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml @@ -73,7 +73,7 @@ spring: preferred-json-mapper: jackson mybatis: - type-aliases-package: com.github.trang.druid.model + type-aliases-package: com.github.trang.druid.example.model --- diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/BaseTest.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java similarity index 62% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/BaseTest.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java index e54510f..fb03a46 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/BaseTest.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java @@ -1,6 +1,7 @@ -package com.github.trang.druid.test; +package com.github.trang.druid.example.test; -import com.github.trang.druid.mapper.CityMapper; +import com.github.trang.druid.example.DruidSpringBootStarterApplication; +import com.github.trang.druid.example.mapper.CityMapper; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -12,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @author trang */ @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(classes = DruidSpringBootStarterApplication.class) public abstract class BaseTest { @Autowired(required = false) diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/DynamicDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java similarity index 98% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/DynamicDataSourceTests.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java index 6246fc6..5313154 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/DynamicDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java @@ -1,8 +1,8 @@ -package com.github.trang.druid.test; +package com.github.trang.druid.example.test; import com.alibaba.druid.pool.DruidDataSource; import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; -import com.github.trang.druid.config.DynamicDataSource; +import com.github.trang.druid.example.config.DynamicDataSource; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/MyBatisTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java similarity index 83% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/MyBatisTests.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java index c2c0f85..88be630 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/MyBatisTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java @@ -1,6 +1,6 @@ -package com.github.trang.druid.test; +package com.github.trang.druid.example.test; -import com.github.trang.druid.model.City; +import com.github.trang.druid.example.model.City; import org.junit.Assert; import org.junit.Test; diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java similarity index 96% rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java index e4f701b..f12792f 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java @@ -1,4 +1,4 @@ -package com.github.trang.druid.test; +package com.github.trang.druid.example.test; import com.alibaba.druid.pool.DruidDataSource; import org.junit.Test;