From f85bad33886c792e5968e8583cbfbbf76dbcf8d7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 22 九月 2021 11:10:10 +0800 Subject: [PATCH] update 调整依赖结构 解决依赖冲突 --- ruoyi-framework/pom.xml | 11 +++++++++++ pom.xml | 29 +++++++++++++++++++++++++++++ ruoyi-common/pom.xml | 17 +++++------------ 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 3f38e6b..73d680a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <druid.version>1.2.6</druid.version> <knife4j.version>3.0.3</knife4j.version> + <swagger-annotations.version>1.5.22</swagger-annotations.version> <poi.version>4.1.2</poi.version> <easyexcel.version>2.2.11</easyexcel.version> <velocity.version>1.7</velocity.version> @@ -76,6 +77,18 @@ <groupId>com.github.xiaoymin</groupId> <artifactId>knife4j-spring-boot-starter</artifactId> <version>${knife4j.version}</version> + <exclusions> + <exclusion> + <artifactId>swagger-annotations</artifactId> + <groupId>io.swagger</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + <version>${swagger-annotations.version}</version> </dependency> <!-- excel宸ュ叿 --> @@ -89,6 +102,16 @@ <groupId>com.alibaba</groupId> <artifactId>easyexcel</artifactId> <version>${easyexcel.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml-schemas</artifactId> + </exclusion> + </exclusions> </dependency> <!-- velocity浠g爜鐢熸垚浣跨敤妯℃澘 --> @@ -139,6 +162,12 @@ <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-openfeign</artifactId> <version>${feign.version}</version> + <exclusions> + <exclusion> + <artifactId>feign-core</artifactId> + <groupId>io.github.openfeign</groupId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 89f56b1..5ed9c92 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -132,6 +132,11 @@ </dependency> <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> @@ -147,22 +152,10 @@ <artifactId>redisson-spring-boot-starter</artifactId> </dependency> - <!-- dynamic-datasource 澶氭暟鎹簮--> - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>dynamic-datasource-spring-boot-starter</artifactId> - </dependency> - <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 --> - <dependency> - <groupId>p6spy</groupId> - <artifactId>p6spy</artifactId> - </dependency> - <dependency> <groupId>com.baomidou</groupId> <artifactId>lock4j-redisson-spring-boot-starter</artifactId> </dependency> - </dependencies> </project> diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 0a147a8..7010724 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -61,6 +61,17 @@ <artifactId>druid-spring-boot-starter</artifactId> </dependency> + <!-- dynamic-datasource 澶氭暟鎹簮--> + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> + </dependency> + <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 --> + <dependency> + <groupId>p6spy</groupId> + <artifactId>p6spy</artifactId> + </dependency> + <!-- 绯荤粺妯″潡--> <dependency> <groupId>com.ruoyi</groupId> -- Gitblit v1.9.3