diff --git a/pom.xml b/pom.xml index d4aaa5f4373ca4d9dba6104a1d7a24b1d83cea15..abefe1015ec698fb80e883386535e05423955396 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,6 @@ 2.3.23 2.2.2 1.2.28 - 2.8.4 8.5.13 8.5.2 3.15.0-GA @@ -132,7 +131,6 @@ 3.1 0.8 2.4.2 - 2.7.2 1.3.6 2.6.1 0.8.0 @@ -151,6 +149,7 @@ 2.6.1 1.16.16 0.8.0 + 1.0.18 @@ -237,6 +236,11 @@ spring-boot-starter-druid ${springboot.druid.version} + + com.alibaba + druid + ${druid.version} + commons-fileupload @@ -260,11 +264,19 @@ org.apache.zookeeper zookeeper ${zookeeper.version} + + org.slf4j + slf4j-log4j12 + com.101tec zkclient ${zkclient.version} + + org.slf4j + slf4j-log4j12 + @@ -293,6 +305,10 @@ javax.servlet javax.servlet-api + + org.slf4j + slf4j-log4j12 + @@ -464,11 +480,11 @@ ${lombok.version} provided - - - - - + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + diff --git a/xbin-store-service-cart/pom.xml b/xbin-store-service-cart/pom.xml index 0df2827b5ec742434499971000f979371ac26e16..09561b1e5221fadd13a4b6694140df434d4d6db3 100644 --- a/xbin-store-service-cart/pom.xml +++ b/xbin-store-service-cart/pom.xml @@ -69,7 +69,10 @@ - + + com.alibaba + druid + diff --git a/xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceSSOApplication.java b/xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceCartApplication.java similarity index 83% rename from xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceSSOApplication.java rename to xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceCartApplication.java index 42503c88eea2e21d8e28468bb7a37ba55c52c194..2b84d489cd7e654d28b75de54360dcd54bc2a20b 100644 --- a/xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceSSOApplication.java +++ b/xbin-store-service-cart/src/main/java/cn/binux/XbinStoreServiceCartApplication.java @@ -12,10 +12,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement @MapperScan(basePackages = "cn.binux.mapper") -public class XbinStoreServiceSSOApplication { +public class XbinStoreServiceCartApplication { public static void main(String[] args) { - SpringApplication.run(XbinStoreServiceSSOApplication.class, args); + SpringApplication.run(XbinStoreServiceCartApplication.class, args); } }