From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
pom.xml | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c31108..cdd1f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.6.0</version>
+ <version>3.0.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>3.0.0</ruoyi-vue-plus.version>
<spring-boot.version>2.5.3</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -22,16 +22,19 @@
<druid.version>1.2.6</druid.version>
<knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
+ <easyexcel.version>2.2.10</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.7.6</hutool.version>
+ <p6spy.version>3.9.1</p6spy.version>
+ <hutool.version>5.7.7</hutool.version>
<feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
+ <feign-okhttp.version>11.2</feign-okhttp.version>
+ <okhttp.version>4.9.1</okhttp.version>
+ <spring-boot-admin.version>2.5.0</spring-boot-admin.version>
<redisson.version>3.16.1</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <datasource.version>3.4.1</datasource.version>
+ <dynamic-ds.version>3.4.1</dynamic-ds.version>
<!-- OSS 閰嶇疆 -->
<qiniu.version>7.8.0</qiniu.version>
@@ -79,6 +82,12 @@
<version>${poi.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -97,7 +106,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${datasource.version}</version>
+ <version>${dynamic-ds.version}</version>
</dependency>
<dependency>
@@ -109,6 +118,12 @@
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
+ </dependency>
+ <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
+ <dependency>
+ <groupId>p6spy</groupId>
+ <artifactId>p6spy</artifactId>
+ <version>${p6spy.version}</version>
</dependency>
<dependency>
@@ -127,6 +142,12 @@
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
<version>${feign-okhttp.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
</dependency>
<dependency>
@@ -248,7 +269,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -259,7 +280,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -276,6 +297,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -284,6 +306,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -295,6 +318,7 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <endpoints.include>health,info</endpoints.include>
</properties>
</profile>
--
Gitblit v1.9.3