diff --git a/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/Application.java b/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/Application.java index 24e93f10c9541bc8e5717e2454686e8f031a9b2f..5fcef42577f3c1f38ab9ba530bf8fcfad43479d1 100644 --- a/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/Application.java +++ b/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/Application.java @@ -1,10 +1,13 @@ package com.itlong.whatsmars.spring.boot; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; @SpringBootApplication +@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) @EnableConfigurationProperties({UserConfig.class}) public class Application { diff --git a/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/UserController.java b/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/UserController.java index 5f258d145947146051bfadee66490b2a9d77daf8..873716243db9d5788eb2f6f79b49e44b43dc02a6 100644 --- a/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/UserController.java +++ b/whatsmars-spring-boot/src/main/java/com/itlong/whatsmars/spring/boot/UserController.java @@ -1,7 +1,6 @@ package com.itlong.whatsmars.spring.boot; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -12,7 +11,6 @@ import java.util.Map; * Created by shenhongxi on 2017/3/27. */ @Controller -@EnableAutoConfiguration public class UserController { @Autowired