zipkin迁移到ES中

pcloud-common-config/src/main/resources.prod/bootstrap.yml

@@ -33,12 +33,12 @@ spring:
       step: PT10S
       db: ${spring.application.name}
       enabled: true
-  zipkin:
-    base-url: http://192.168.1.175:9399
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
+  zipkin: 
+    sender: 
+      type: rabbit
+    rabbitmq:
+      queue: zipkin
+  sleuth: 
     sampler:
       percentage: 0.02
   rabbitmq:

pcloud-common-config/src/main/resources.uat/bootstrap.yml

@@ -31,16 +31,16 @@ spring:
     influx:
       uri: http://192.168.89.200:8086/write
       step: PT10S
-      db: ${spring.application.name}
+      db: rays-uat
       enabled: false
-  zipkin:
-    base-url: http://192.168.93.57:9393
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
+  zipkin: 
+    sender: 
+      type: rabbit
+    rabbitmq:
+      queue: zipkin
+  sleuth: 
     sampler:
-      percentage: 1
+      percentage: 0.5
   rabbitmq:
     addresses: 192.168.92.56:5673,192.168.92.57:5673,192.168.92.58:5673
     username: pcloud

pcloud-common/pom.xml

@@ -26,8 +26,12 @@
 			<artifactId>pcloud-common-config</artifactId>
 			<version>${pcloud-common-config.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
 
-		<!-- Spring Cloud Begin -->
+		<!-- Spring Boot Begin -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -37,9 +41,12 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<!-- Spring Boot Begin -->
+
+		<!-- Spring Cloud Begin -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
@@ -73,12 +80,16 @@
 			<artifactId>spring-retry</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-actuator</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-sleuth</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
@@ -91,18 +102,6 @@
 			<version>1.0.0-rc.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.7.0</version>
@@ -203,7 +202,6 @@
 		<dependency>
 			<groupId>com.jcraft</groupId>
 			<artifactId>jsch</artifactId>
-			<version>0.1.53</version>
 		</dependency>
 		<!-- sftp end -->
 

pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.5.8.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -101,7 +101,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Dalston.SR3</spring-cloud.version>
+		<spring-cloud.version>Edgware.SR3</spring-cloud.version>
 		<spring.data.solr.version>2.1.7.RELEASE</spring.data.solr.version>
 
 		<!-- frameworks -->
@@ -208,7 +208,7 @@
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>druid</artifactId>
-				<version>1.0.15</version>
+				<version>1.0.18</version>
 			</dependency>
 			<dependency>
 				<groupId>com.alibaba</groupId>