|
|
@@ -119,10 +119,10 @@
|
|
|
<version>2.3.1.RELEASE</version>
|
|
|
</dependency>
|
|
|
<!--zipkin-->
|
|
|
- <dependency>
|
|
|
- <groupId>org.springframework.cloud</groupId>
|
|
|
- <artifactId>spring-cloud-starter-zipkin</artifactId>
|
|
|
- </dependency>
|
|
|
+<!-- <dependency>-->
|
|
|
+<!-- <groupId>org.springframework.cloud</groupId>-->
|
|
|
+<!-- <artifactId>spring-cloud-starter-zipkin</artifactId>-->
|
|
|
+<!-- </dependency>-->
|
|
|
<!--webflux与webmvc不兼容，需要排除掉，否则会项目启动不起来-->
|
|
|
<dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
@@ -185,6 +185,8 @@
|
|
|
<includes>
|
|
|
<include>**/*</include>
|
|
|
</includes>
|
|
|
+ <!-- 启用过滤器，过滤器会解析需要过滤的的资源文件，将其中的变量替换成真实的值 -->
|
|
|
+ <filtering>true</filtering>
|
|
|
</resource>
|
|
|
<resource> <!--日志配置文件-->
|
|
|
<directory>src/main/resources</directory>
|
