From d93ad9bbb435bd12d08c5d86136c07d76e693b8f Mon Sep 17 00:00:00 2001
From: qinyingjie <qinyingjie@deepexi.com>
Date: Mon, 16 Jan 2023 18:58:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev/application-goods9100.yaml                     |  5 -----
 .../dev/application-goods9200.yaml                     |  5 -----
 .../dev/application-goods9300.yaml                     |  5 -----
 springcloud-service-goods-9100/pom.xml                 |  4 ++++
 .../src/main/resources/bootstrap.yml                   |  8 ++++++++
 springcloud-service-goods-9200/pom.xml                 |  4 ++++
 .../src/main/resources/bootstrap.yml                   |  8 ++++++++
 springcloud-service-goods-9300/pom.xml                 |  4 ++++
 .../src/main/resources/bootstrap.yml                   |  8 ++++++++
 springcloud-service-portal-8080/pom.xml                |  4 ++++
 .../src/main/resources/bootstrap.yml                   |  8 ++++++++
 springcloud-service-portal-8081/pom.xml                |  7 ++-----
 .../com/kwan/springcloud/PortalApplication8081.java    | 10 +++++-----
 .../src/main/resources/bootstrap.yml                   |  8 ++++++++
 14 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/springcloud-service-config-info/dev/application-goods9100.yaml b/springcloud-service-config-info/dev/application-goods9100.yaml
index 97a39bd..3b36723 100644
--- a/springcloud-service-config-info/dev/application-goods9100.yaml
+++ b/springcloud-service-config-info/dev/application-goods9100.yaml
@@ -8,11 +8,6 @@ spring:
     password: 716288qwe
   application:
     name: goods-service #服务名称
-  zipkin:
-    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
-  sleuth:
-    sampler:
-      percentage: 0.1 #收集百分比
 
 #服务提供者
 eureka:
diff --git a/springcloud-service-config-info/dev/application-goods9200.yaml b/springcloud-service-config-info/dev/application-goods9200.yaml
index bb7cf25..a9509c5 100644
--- a/springcloud-service-config-info/dev/application-goods9200.yaml
+++ b/springcloud-service-config-info/dev/application-goods9200.yaml
@@ -8,11 +8,6 @@ spring:
     password: 716288qwe
   application:
     name: goods-service #服务名
-  zipkin:
-    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
-  sleuth:
-    sampler:
-      percentage: 0.1 #收集百分比
 
 
 #服务提供者
diff --git a/springcloud-service-config-info/dev/application-goods9300.yaml b/springcloud-service-config-info/dev/application-goods9300.yaml
index 13e2bac..5e214f1 100644
--- a/springcloud-service-config-info/dev/application-goods9300.yaml
+++ b/springcloud-service-config-info/dev/application-goods9300.yaml
@@ -8,11 +8,6 @@ spring:
     password: 716288qwe
   application:
     name: goods-service #服务名称
-  zipkin:
-    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
-  sleuth:
-    sampler:
-      percentage: 0.1 #收集百分比
 
 #服务提供者
 eureka:
diff --git a/springcloud-service-goods-9100/pom.xml b/springcloud-service-goods-9100/pom.xml
index be41d2e..4a6bf1a 100644
--- a/springcloud-service-goods-9100/pom.xml
+++ b/springcloud-service-goods-9100/pom.xml
@@ -67,6 +67,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/springcloud-service-goods-9100/src/main/resources/bootstrap.yml b/springcloud-service-goods-9100/src/main/resources/bootstrap.yml
index 41144f7..a97fb75 100644
--- a/springcloud-service-goods-9100/src/main/resources/bootstrap.yml
+++ b/springcloud-service-goods-9100/src/main/resources/bootstrap.yml
@@ -11,6 +11,14 @@ spring:
       name: application-goods9100         #获取的文件名
       profile: goods9100        #文件后缀
       uri: http://localhost:7001  #配置中心服务端地址
+  zipkin:
+    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
+    discovery-client-enabled: false
+    sender:
+      type: web
+  sleuth:
+    sampler:
+      percentage: 0.1 #收集百分比
 eureka:
   client:
     service-url:
diff --git a/springcloud-service-goods-9200/pom.xml b/springcloud-service-goods-9200/pom.xml
index 9686065..8203c11 100644
--- a/springcloud-service-goods-9200/pom.xml
+++ b/springcloud-service-goods-9200/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/springcloud-service-goods-9200/src/main/resources/bootstrap.yml b/springcloud-service-goods-9200/src/main/resources/bootstrap.yml
index 63f3460..c3bb83e 100644
--- a/springcloud-service-goods-9200/src/main/resources/bootstrap.yml
+++ b/springcloud-service-goods-9200/src/main/resources/bootstrap.yml
@@ -11,6 +11,14 @@ spring:
       name: application-goods9200         #获取的文件名
       profile: goods9200        #文件后缀
       uri: http://localhost:7001  #配置中心服务端地址
+  zipkin:
+    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
+    discovery-client-enabled: false
+    sender:
+      type: web
+  sleuth:
+    sampler:
+      percentage: 0.1 #收集百分比
 eureka:
   client:
     service-url:
diff --git a/springcloud-service-goods-9300/pom.xml b/springcloud-service-goods-9300/pom.xml
index 2470125..97aebe8 100644
--- a/springcloud-service-goods-9300/pom.xml
+++ b/springcloud-service-goods-9300/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/springcloud-service-goods-9300/src/main/resources/bootstrap.yml b/springcloud-service-goods-9300/src/main/resources/bootstrap.yml
index e1a0a16..7cfec35 100644
--- a/springcloud-service-goods-9300/src/main/resources/bootstrap.yml
+++ b/springcloud-service-goods-9300/src/main/resources/bootstrap.yml
@@ -11,6 +11,14 @@ spring:
       name: application-goods9300         #获取的文件名
       profile: goods9300        #文件后缀
       uri: http://localhost:7001  #配置中心服务端地址
+  zipkin:
+    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
+    discovery-client-enabled: false
+    sender:
+      type: web
+  sleuth:
+    sampler:
+      percentage: 0.1 #收集百分比
 #注册中心配置
 eureka:
   client:
diff --git a/springcloud-service-portal-8080/pom.xml b/springcloud-service-portal-8080/pom.xml
index 8c1fbd3..82dd638 100644
--- a/springcloud-service-portal-8080/pom.xml
+++ b/springcloud-service-portal-8080/pom.xml
@@ -49,6 +49,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/springcloud-service-portal-8080/src/main/resources/bootstrap.yml b/springcloud-service-portal-8080/src/main/resources/bootstrap.yml
index 8b523f8..13d6215 100644
--- a/springcloud-service-portal-8080/src/main/resources/bootstrap.yml
+++ b/springcloud-service-portal-8080/src/main/resources/bootstrap.yml
@@ -11,6 +11,14 @@ spring:
       name: application-portal8080         #获取的文件名
       profile: portal8080        #文件后缀
       uri: http://localhost:7001  #配置中心服务端地址
+  zipkin:
+    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
+    discovery-client-enabled: false
+    sender:
+      type: web
+  sleuth:
+    sampler:
+      percentage: 0.1 #收集百分比
 eureka:
   client:
     service-url:
diff --git a/springcloud-service-portal-8081/pom.xml b/springcloud-service-portal-8081/pom.xml
index 1205b0d..9b0be19 100644
--- a/springcloud-service-portal-8081/pom.xml
+++ b/springcloud-service-portal-8081/pom.xml
@@ -51,12 +51,9 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sleuth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>
diff --git a/springcloud-service-portal-8081/src/main/java/com/kwan/springcloud/PortalApplication8081.java b/springcloud-service-portal-8081/src/main/java/com/kwan/springcloud/PortalApplication8081.java
index 16dd6ec..906d83a 100644
--- a/springcloud-service-portal-8081/src/main/java/com/kwan/springcloud/PortalApplication8081.java
+++ b/springcloud-service-portal-8081/src/main/java/com/kwan/springcloud/PortalApplication8081.java
@@ -10,11 +10,11 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 
 /**
- * 
- *  http://localhost:8081/portal/hystrix/1
- *@version : 2.2.0
- *@author : qinyingjie
- *@date : 2023/1/14 16:07
+ * http://localhost:8081/portal/hystrix/1
+ *
+ * @author : qinyingjie
+ * @version : 2.2.0
+ * @date : 2023/1/14 16:07
  */
 @EnableFeignClients
 @EnableHystrix
diff --git a/springcloud-service-portal-8081/src/main/resources/bootstrap.yml b/springcloud-service-portal-8081/src/main/resources/bootstrap.yml
index 36ee510..34ebd14 100644
--- a/springcloud-service-portal-8081/src/main/resources/bootstrap.yml
+++ b/springcloud-service-portal-8081/src/main/resources/bootstrap.yml
@@ -10,6 +10,14 @@ spring:
       name: application-portal8081       #获取的文件名
       profile: portal8081       #文件后缀
       uri: http://localhost:7001  #配置中心服务端地址
+  zipkin:
+    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
+    discovery-client-enabled: false
+    sender:
+      type: web
+  sleuth:
+    sampler:
+      percentage: 0.1 #收集百分比
 eureka:
   client:
     service-url:
-- 
GitLab