Merge remote-tracking branch 'origin/Release-1.1' into develop

2018-08-20 17:42:34 +08:00
parent 054938a473 9a0659f022
commit d86cb08e3d
10 changed files with 433 additions and 99 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -557,6 +557,14 @@
 			<artifactId>fastdfs-client-java</artifactId>
 			<version>1.27-SNAPSHOT</version>
 		</dependency>
+		
+		
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>druid</artifactId>
+		    <version>1.1.10</version>
+		</dependency>
+		
 	</dependencies>

 </project>