diff --git a/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot-autoconfigure/pom.xml
index 8fe994c..54736e0 100644
--- a/druid-spring-boot-autoconfigure/pom.xml
+++ b/druid-spring-boot-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
com.github.drtrang
druid-spring-boot
- 1.0.2
+ 1.0.3-SNAPSHOT
druid-spring-boot-autoconfigure
diff --git a/druid-spring-boot-samples/pom.xml b/druid-spring-boot-samples/pom.xml
index 00ad225..3eca54c 100644
--- a/druid-spring-boot-samples/pom.xml
+++ b/druid-spring-boot-samples/pom.xml
@@ -7,7 +7,7 @@
com.github.drtrang
druid-spring-boot
- 1.0.2
+ 1.0.3-SNAPSHOT
druid-spring-boot-samples
@@ -68,14 +68,18 @@
com.github.drtrang
druid-spring-boot-starter
-
- org.springframework.boot
- spring-boot-starter-test
-
com.h2database
h2
+
+ com.google.code.gson
+ gson
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
diff --git a/druid-spring-boot-samples/src/main/resources/application.yml b/druid-spring-boot-samples/src/main/resources/application.yml
index 8820e32..ed0bc69 100644
--- a/druid-spring-boot-samples/src/main/resources/application.yml
+++ b/druid-spring-boot-samples/src/main/resources/application.yml
@@ -10,8 +10,8 @@ logging:
spring:
profiles:
- # 默认环境为 single,多数据源示例改为 dynamic
- active: single
+ # 默认环境为 default,多数据源示例改为 dynamic
+ active: default
datasource:
driver-class-name: org.h2.Driver
url: jdbc:h2:file:./samples
@@ -70,6 +70,11 @@ spring:
aop:
auto: true
proxy-target-class: true
+ http:
+ encoding:
+ force: true
+ converters:
+ preferred-json-mapper: gson
mybatis:
type-aliases-package: com.github.trang.druid.model
@@ -79,7 +84,7 @@ mybatis:
debug: false
spring:
- profiles: single
+ profiles: default
---
diff --git a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java
index c9dec7a..ef466e0 100644
--- a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java
+++ b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/SingleDataSourceTests.java
@@ -3,7 +3,6 @@ package com.github.trang.druid.test;
import com.alibaba.druid.pool.DruidDataSource;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ActiveProfiles;
import static org.junit.Assert.assertEquals;
@@ -12,7 +11,6 @@ import static org.junit.Assert.assertEquals;
*
* @author trang
*/
-@ActiveProfiles("single")
public class SingleDataSourceTests extends BaseTest {
@Autowired
diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index bbe49af..fff452f 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
com.github.drtrang
druid-spring-boot
- 1.0.2
+ 1.0.3-SNAPSHOT
druid-spring-boot-starter
diff --git a/pom.xml b/pom.xml
index 7694f96..ed8eaab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.drtrang
druid-spring-boot
- 1.0.2
+ 1.0.3-SNAPSHOT
pom
${project.artifactId}