From af25588b88a727b6c945796e3cf34ed3d4f05e89 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 25 十一月 2021 19:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
pom.xml | 60 ++++++++++++++----------------------------------------------
1 files changed, 14 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b6144d..dfb3464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.2.0</version>
+ <version>3.3.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>3.2.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.6</spring-boot.version>
+ <ruoyi-vue-plus.version>3.3.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.7</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>
@@ -24,19 +24,17 @@
<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>
+ <velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.15</hutool.version>
- <feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.6</feign-okhttp.version>
- <okhttp.version>4.9.1</okhttp.version>
- <spring-boot-admin.version>2.5.2</spring-boot-admin.version>
- <redisson.version>3.16.3</redisson.version>
+ <hutool.version>5.7.16</hutool.version>
+ <okhttp.version>4.9.2</okhttp.version>
+ <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
+ <redisson.version>3.16.4</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
- <tlog.version>1.3.3</tlog.version>
+ <tlog.version>1.3.4</tlog.version>
<xxl-job.version>2.3.0</xxl-job.version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
@@ -46,7 +44,7 @@
<qiniu.version>7.8.0</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version>
<qcloud.cos.version>5.6.58</qcloud.cos.version>
- <minio.version>8.3.1</minio.version>
+ <minio.version>8.3.3</minio.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
@@ -120,7 +118,7 @@
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
@@ -166,25 +164,6 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
- </dependency>
-
- <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
- <dependency>
- <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>
- <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
- <dependency>
- <groupId>io.github.openfeign</groupId>
- <artifactId>feign-okhttp</artifactId>
- <version>${feign-okhttp.version}</version>
</dependency>
<dependency>
@@ -247,21 +226,8 @@
<dependency>
<groupId>com.yomahub</groupId>
- <artifactId>tlog-feign</artifactId>
- <version>${tlog.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
<artifactId>tlog-xxl-job</artifactId>
<version>${tlog.version}</version>
- </dependency>
-
- <!-- 瀹氭椂浠诲姟 @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 瀹氭椂浠诲姟 -->
@@ -320,7 +286,6 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
<module>ruoyi-job</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
@@ -385,6 +350,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
</profile>
@@ -394,6 +360,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
<activation>
@@ -406,6 +373,7 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <knife4j.production>true</knife4j.production>
<endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
--
Gitblit v1.9.3