From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
pom.xml | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index db8b6b9..286d8fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.7</spring-boot.version>
+ <spring-boot.version>2.5.8</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,27 +24,28 @@
<swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
<easyexcel.version>2.2.11</easyexcel.version>
+ <cglib.version>3.3.0</cglib.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.28.0</satoken.version>
<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.16</hutool.version>
+ <hutool.version>5.7.17</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>
+ <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
+ <redisson.version>3.16.6</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.4.1</dynamic-ds.version>
- <tlog.version>1.3.4</tlog.version>
+ <dynamic-ds.version>3.5.0</dynamic-ds.version>
+ <tlog.version>1.3.6</tlog.version>
<xxl-job.version>2.3.0</xxl-job.version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
<jaxb.version>3.0.1</jaxb.version>
<!-- OSS 閰嶇疆 -->
- <qiniu.version>7.8.0</qiniu.version>
+ <qiniu.version>7.9.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.3</minio.version>
+ <minio.version>8.3.4</minio.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
@@ -115,6 +116,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -168,7 +175,31 @@
<dependency>
<groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
+ <artifactId>hutool-core</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-http</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-captcha</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-extra</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-jwt</artifactId>
<version>${hutool.version}</version>
</dependency>
@@ -210,29 +241,13 @@
<dependency>
<groupId>com.yomahub</groupId>
- <artifactId>tlog-spring-boot-configuration</artifactId>
+ <artifactId>tlog-web-spring-boot-starter</artifactId>
<version>${tlog.version}</version>
</dependency>
<dependency>
<groupId>com.yomahub</groupId>
- <artifactId>tlog-webroot</artifactId>
- <version>${tlog.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>org.javassist</groupId>
- </exclusion>
- <exclusion>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-xxl-job</artifactId>
+ <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
<version>${tlog.version}</version>
</dependency>
--
Gitblit v1.9.3