From 72f8d08ae0304daef5840321f57063c7e3e84487 Mon Sep 17 00:00:00 2001
From: qinyingjie <qinyingjie@deepexi.com>
Date: Mon, 16 Jan 2023 18:41:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev/application-portal8080.yaml           |  5 ---
 springcloud-service-portal-8080/pom.xml       |  2 -
 springcloud-service-portal-8081/pom.xml       |  8 ++++
 springcloud-service-zipkin/pom.xml            | 40 +++++++------------
 .../kwan/springcloud/ZipkinApplication.java   |  7 +++-
 .../src/main/resources/application.yaml       | 11 ++---
 .../springcloud/ZipkinApplicationTests.java   | 13 ------
 7 files changed, 35 insertions(+), 51 deletions(-)
 delete mode 100644 springcloud-service-zipkin/src/test/java/com/kwan/springcloud/ZipkinApplicationTests.java

diff --git a/springcloud-service-config-info/dev/application-portal8080.yaml b/springcloud-service-config-info/dev/application-portal8080.yaml
index 4c9f685..ef5ba05 100644
--- a/springcloud-service-config-info/dev/application-portal8080.yaml
+++ b/springcloud-service-config-info/dev/application-portal8080.yaml
@@ -1,11 +1,6 @@
 spring:
   application:
     name: portal-service #服务名称
-  zipkin:
-    base-url: http://localhost:9411 #zipkin地址 默认值就是0.1，代表收集10%的请求追踪信息。
-  sleuth:
-    sampler:
-      percentage: 0.1 #收集百分比
 eureka:
   client:
     service-url:
diff --git a/springcloud-service-portal-8080/pom.xml b/springcloud-service-portal-8080/pom.xml
index 811d39b..8c1fbd3 100644
--- a/springcloud-service-portal-8080/pom.xml
+++ b/springcloud-service-portal-8080/pom.xml
@@ -49,8 +49,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-
     </dependencies>
 
     <build>
diff --git a/springcloud-service-portal-8081/pom.xml b/springcloud-service-portal-8081/pom.xml
index 9dce6d2..1205b0d 100644
--- a/springcloud-service-portal-8081/pom.xml
+++ b/springcloud-service-portal-8081/pom.xml
@@ -49,6 +49,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </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>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/springcloud-service-zipkin/pom.xml b/springcloud-service-zipkin/pom.xml
index 47da53c..b1fdee5 100644
--- a/springcloud-service-zipkin/pom.xml
+++ b/springcloud-service-zipkin/pom.xml
@@ -12,42 +12,32 @@
     <name>springcloud-service-zipkin</name>
     <properties>
         <java.version>1.8</java.version>
-
     </properties>
     <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.zipkin.java</groupId>
             <artifactId>zipkin-server</artifactId>
-            <version>2.10.4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-log4j2</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.12.3</version>
         </dependency>
         <dependency>
             <groupId>io.zipkin.java</groupId>
             <artifactId>zipkin-autoconfigure-ui</artifactId>
-            <version>2.10.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>2.12.3</version>
         </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-test</artifactId>-->
+        <!--            <scope>test</scope>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-web</artifactId>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.cloud</groupId>-->
+        <!--            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
+        <!--        </dependency>-->
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/springcloud-service-zipkin/src/main/java/com/kwan/springcloud/ZipkinApplication.java b/springcloud-service-zipkin/src/main/java/com/kwan/springcloud/ZipkinApplication.java
index c0b6a4c..c95cd4b 100644
--- a/springcloud-service-zipkin/src/main/java/com/kwan/springcloud/ZipkinApplication.java
+++ b/springcloud-service-zipkin/src/main/java/com/kwan/springcloud/ZipkinApplication.java
@@ -7,7 +7,12 @@ import zipkin2.server.internal.EnableZipkinServer;
 
 
 /**
- * http:/localhost:9411/zipkin
+ * http://127.0.0.1:9411/zipkin/
+ *
+ *
+ *
+ *
+ *
  *
  * @author : qinyingjie
  * @version : 2.2.0
diff --git a/springcloud-service-zipkin/src/main/resources/application.yaml b/springcloud-service-zipkin/src/main/resources/application.yaml
index 65e3163..d400f70 100644
--- a/springcloud-service-zipkin/src/main/resources/application.yaml
+++ b/springcloud-service-zipkin/src/main/resources/application.yaml
@@ -5,8 +5,9 @@ server:
 spring:
   application:
     name: zipkin-service
-#注册中心
-eureka:
-  client:
-    service-url:
-      defaultZone: http://eureka8767:8767/eureka/,http://eureka8768:8768/eureka/,http://eureka8769:8769/eureka/
+#启动报错问题
+management:
+  metrics:
+    web:
+      server:
+        auto-time-requests: false
diff --git a/springcloud-service-zipkin/src/test/java/com/kwan/springcloud/ZipkinApplicationTests.java b/springcloud-service-zipkin/src/test/java/com/kwan/springcloud/ZipkinApplicationTests.java
deleted file mode 100644
index 12bef34..0000000
--- a/springcloud-service-zipkin/src/test/java/com/kwan/springcloud/ZipkinApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.kwan.springcloud;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ZipkinApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
-- 
GitLab