From a3717b69286243368838d671fb4645a17143addc Mon Sep 17 00:00:00 2001
From: da <1163925944@qq.com>
Date: Thu, 7 Dec 2017 12:11:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0druid=E4=BE=9D=E8=B5=96=202?=
 =?UTF-8?q?.=E4=BF=AE=E5=A4=8Dslf4j=E6=97=A5=E5=BF=97=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=203.=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=A8=A1=E5=9D=97xbin-store-service-cart=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 30 ++++++++++++++-----
 xbin-store-service-cart/pom.xml               |  5 +++-
 ...a => XbinStoreServiceCartApplication.java} |  4 +--
 3 files changed, 29 insertions(+), 10 deletions(-)
 rename xbin-store-service-cart/src/main/java/cn/binux/{XbinStoreServiceSSOApplication.java => XbinStoreServiceCartApplication.java} (83%)

diff --git a/pom.xml b/pom.xml
index d4aaa5f..abefe10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
         <freemarker.version>2.3.23</freemarker.version>
         <quartz.version>2.2.2</quartz.version>
         <fastjson.version>1.2.28</fastjson.version>
-        <dubbo.version>2.8.4</dubbo.version>
         <tomcat.embed.version>8.5.13</tomcat.embed.version>
         <tomcat.embed.logging.version>8.5.2</tomcat.embed.logging.version>
         <javassist.version>3.15.0-GA</javassist.version>
@@ -132,7 +131,6 @@
         <bsf.version>3.1</bsf.version>
         <sorcerer.version>0.8</sorcerer.version>
         <curator.version>2.4.2</curator.version>
-        <jedis.version>2.7.2</jedis.version>
         <xmemcached.version>1.3.6</xmemcached.version>
         <cxf.version>2.6.1</cxf.version>
         <thrift.version>0.8.0</thrift.version>
@@ -151,6 +149,7 @@
         <springfox.swagger2.version>2.6.1</springfox.swagger2.version>
         <lombok.version>1.16.16</lombok.version>
         <apollo.version>0.8.0</apollo.version>
+        <druid.version>1.0.18</druid.version>
     </properties>
 
     <dependencyManagement>
@@ -237,6 +236,11 @@
                 <artifactId>spring-boot-starter-druid</artifactId>
                 <version>${springboot.druid.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
             <!-- 文件上传组件 -->
             <dependency>
                 <groupId>commons-fileupload</groupId>
@@ -260,11 +264,19 @@
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <exclusions><exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion></exclusions>
             </dependency>
             <dependency>
                 <groupId>com.101tec</groupId>
                 <artifactId>zkclient</artifactId>
                 <version>${zkclient.version}</version>
+                <exclusions><exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion></exclusions>
             </dependency>
             <!-- freemarker -->
             <dependency>
@@ -293,6 +305,10 @@
                         <groupId>javax.servlet</groupId>
                         <artifactId>javax.servlet-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -464,11 +480,11 @@
                 <version>${lombok.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>com.ctrip.framework.apollo</groupId>-->
-                <!--<artifactId>apollo-client</artifactId>-->
-                <!--<version>${apollo.version}</version>-->
-            <!--</dependency>-->
+            <dependency>
+                <groupId>com.ctrip.framework.apollo</groupId>
+                <artifactId>apollo-client</artifactId>
+                <version>${apollo.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/xbin-store-service-cart/pom.xml b/xbin-store-service-cart/pom.xml
index 0df2827..09561b1 100644
--- a/xbin-store-service-cart/pom.xml
+++ b/xbin-store-service-cart/pom.xml
@@ -69,7 +69,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>
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 42503c8..2b84d48 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);
 
 	}
 }
-- 
Gitee