From 7c8dd238def9c50b6049707256509e5e0c12fe36 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 17:08:21 +0800
Subject: [PATCH] !29 同步dev分支 Merge pull request !29 from 疯狂的狮子li/dev
---
pom.xml | 83 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 57 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5dc722d..82cf791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
<artifactId>ruoyi</artifactId>
<version>3.4.0</version>
- <name>ruoyi</name>
- <url>http://www.ruoyi.vip</url>
+ <name>RuoYi-Vue-Plus</name>
+ <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
@@ -19,14 +19,11 @@
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.4</druid.version>
- <swagger.version>2.9.2</swagger.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>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
@@ -34,6 +31,7 @@
<hutool.version>5.5.8</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>
<!-- 渚濊禆澹版槑 -->
@@ -55,7 +53,7 @@
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
-
+
<!-- pagehelper 鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
@@ -87,43 +85,11 @@
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
-
- <!-- swagger2-->
+
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
- <!--io甯哥敤宸ュ叿绫� -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
-
- <!--鏂囦欢涓婁紶宸ュ叿绫� -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>${knife4j.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -138,21 +104,8 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
- <!-- collections宸ュ叿绫� -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
- </dependency>
-
+
<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -195,6 +148,22 @@
<version>${feign-okhttp.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-server</artifactId>
+ <version>${spring-boot-admin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
+ <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>
--
Gitblit v1.9.3