From 2a2e973fe173be0d054c7468c32fd21bae104ad4 Mon Sep 17 00:00:00 2001
From: HelloCoCooo <46306510+HelloCoCooo@users.noreply.github.com>
Date: Tue, 12 May 2020 18:25:09 +0800
Subject: [PATCH] Fix dependency conflict issue

---
 pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd2d81a..5029a94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<!-- log -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+		</dependency>
 		<!-- 长连接 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -75,11 +81,6 @@
 			<artifactId>guava</artifactId>
 			<version>19.0</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>