From 25264faf3792cdc90a5a68c488b5af239caf3724 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 25 五月 2021 14:28:58 +0800
Subject: [PATCH] 配置文件错误
---
pom.xml | 94 +++++++++++++++++------------------------------
1 files changed, 34 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index 43443e1..a197fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<version>${ruoyi-vue-plus.version}</version>
@@ -11,42 +11,41 @@
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
-
+
<properties>
- <ruoyi-vue-plus.version>1.0.0</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>2.2.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.4</druid.version>
- <knife4j.version>2.0.8</knife4j.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <fastjson.version>1.2.75</fastjson.version>
- <oshi.version>5.6.0</oshi.version>
- <jna.version>5.7.0</jna.version>
+ <druid.version>1.2.6</druid.version>
+ <knife4j.version>3.0.2</knife4j.version>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
+ <fastjson.version>1.2.76</fastjson.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.2</mybatis-plus.version>
- <hutool.version>5.5.8</hutool.version>
+ <mybatis-plus.version>3.4.3</mybatis-plus.version>
+ <hutool.version>5.6.5</hutool.version>
<feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
</properties>
-
+
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
-
+
<!-- SpringBoot鐨勪緷璧栭厤缃�-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.13.RELEASE</version>
+ <version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
+
<!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -54,51 +53,31 @@
<version>${druid.version}</version>
</dependency>
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 鑾峰彇绯荤粺淇℃伅 -->
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>${oshi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
<dependency>
<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宸ュ叿 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
-
+
<!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -112,7 +91,7 @@
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
-
+
<!--Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
@@ -159,39 +138,34 @@
<version>${spring-boot-admin.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -295,4 +269,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3