diff --git a/pom.xml b/pom.xml index f7aa48745ad788f1c70aa5bf35e3e5b3a1754e2a..ef273817f972b5a12a024c6adad5c7e036fd198c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,11 +29,11 @@ - 1.5.9.RELEASE - 4.3.13.RELEASE - 3.4.0 - 3.1.0 - 1.2.2 + + 1.5.6.RELEASE + 4.3.10.RELEASE + 3.4.5 + 1.3.1 1.4 5.1.32 2.6 @@ -41,6 +41,7 @@ 1.10 1.3.1 1.2.17 + 3.1.0 1.7 2.0 2.4 diff --git a/whatsmars-dbrouter/pom.xml b/whatsmars-dbrouter/pom.xml index faab3336eebfe523c2601b0b38852c54e81b2a73..7266041f7fc7195674c867c8c792fabace6581ae 100644 --- a/whatsmars-dbrouter/pom.xml +++ b/whatsmars-dbrouter/pom.xml @@ -55,10 +55,6 @@ aspectjtools - - org.slf4j - slf4j-api - log4j log4j diff --git a/whatsmars-earth/whatsmars-earth-dao/pom.xml b/whatsmars-earth/whatsmars-earth-dao/pom.xml index 51cc8ee6980ec3f20c53081384b83ea258219e74..bed142128f980c08a9f31fd136e15a81dab3b281 100644 --- a/whatsmars-earth/whatsmars-earth-dao/pom.xml +++ b/whatsmars-earth/whatsmars-earth-dao/pom.xml @@ -32,6 +32,7 @@ org.mybatis mybatis + 3.2.7 diff --git a/whatsmars-earth/whatsmars-earth-support-web/pom.xml b/whatsmars-earth/whatsmars-earth-support-web/pom.xml index b3da05e18a2c97017954b6f7a3a5be0dc44c8fbf..779c6e583817b3351a789c5120820a473ac0b6ad 100644 --- a/whatsmars-earth/whatsmars-earth-support-web/pom.xml +++ b/whatsmars-earth/whatsmars-earth-support-web/pom.xml @@ -22,11 +22,6 @@ whatsmars-earth-service 1.0-SNAPSHOT - - com.whatsmars - whatsmars-common - 1.0-SNAPSHOT - org.springframework @@ -45,6 +40,10 @@ spring-jdbc + + org.mybatis + mybatis + org.mybatis mybatis-spring diff --git a/whatsmars-spring-boot/pom.xml b/whatsmars-spring-boot/pom.xml index 672834db9983d662a6c8daf2bb06f06d39c6f168..e92f75b18e6ad51425e040cc2dc87e9f27e82023 100644 --- a/whatsmars-spring-boot/pom.xml +++ b/whatsmars-spring-boot/pom.xml @@ -38,12 +38,6 @@ org.springframework.boot spring-boot-starter-web - - - ch.qos.logback - logback-classic - - org.springframework.boot @@ -53,12 +47,6 @@ org.springframework.boot spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-logging - - @@ -75,21 +63,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.3.0 - - - org.springframework.boot - spring-boot-starter-logging - - - ch.qos.logback - logback-classic - - - - - commons-dbcp - commons-dbcp + 1.3.1 mysql @@ -110,12 +84,6 @@ io.springfox springfox-swagger2 2.5.0 - - - com.google.guava - guava - - io.springfox @@ -128,10 +96,6 @@ com.google.code.gson gson - - com.google.guava - guava - diff --git a/whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java b/whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java index 54f3769ea35ac2680ce38bec6ac6a45e18d170e4..6814a1cef1621933220e0163bd7ee5a2ffe352b2 100644 --- a/whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java +++ b/whatsmars-spring-boot/src/main/java/com/whatsmars/spring/boot/App.java @@ -9,8 +9,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @SpringBootApplication -// 加上exclude=DataSource..后,不会连接数据库,同时@Mapper也不会起作用 -//@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) @EnableConfigurationProperties({UserConfig.class}) @ImportResource(locations={"classpath*:spring/*.xml"}) public class App {