依赖冲突处理

This commit is contained in:
wenchaogong 2021-08-20 18:42:47 +08:00
parent acfcd65879
commit 67b7f93f6f

11
pom.xml
View File

@ -34,7 +34,7 @@
<feign-okhttp.version>11.2</feign-okhttp.version> <feign-okhttp.version>11.2</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version> <okhttp.version>4.9.1</okhttp.version>
<spring-boot-admin.version>2.5.0</spring-boot-admin.version> <spring-boot-admin.version>2.5.0</spring-boot-admin.version>
<okio.version>1.17.2</okio.version> <okio.version>2.8.0</okio.version>
<redisson.version>3.16.1</redisson.version> <redisson.version>3.16.1</redisson.version>
<lock4j.version>2.2.1</lock4j.version> <lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version> <dynamic-ds.version>3.4.1</dynamic-ds.version>
@ -97,6 +97,12 @@
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version> <version>${easyexcel.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- velocity代码生成使用模板 --> <!-- velocity代码生成使用模板 -->
@ -345,6 +351,7 @@
<!-- 环境标识,需要与配置文件的名称相对应 --> <!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>local</profiles.active> <profiles.active>local</profiles.active>
<logging.level>debug</logging.level> <logging.level>debug</logging.level>
<endpoints.include>'*'</endpoints.include>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@ -353,6 +360,7 @@
<!-- 环境标识,需要与配置文件的名称相对应 --> <!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
<logging.level>debug</logging.level> <logging.level>debug</logging.level>
<endpoints.include>'*'</endpoints.include>
</properties> </properties>
<activation> <activation>
<!-- 默认环境 --> <!-- 默认环境 -->
@ -364,6 +372,7 @@
<properties> <properties>
<profiles.active>prod</profiles.active> <profiles.active>prod</profiles.active>
<logging.level>warn</logging.level> <logging.level>warn</logging.level>
<endpoints.include>health,info</endpoints.include>
</properties> </properties>
</profile> </profile>