From b60fa5c920b5eb7cf4a2e3e1cacfe779d2f9ff12 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 12 Feb 2022 14:01:41 +0800
Subject: [PATCH] !144 删除方法无返回值时，方法注释上的@return Merge pull request !144 from 我的世界有我/master
---
pom.xml | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c46535..2b15503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,38 +6,39 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.1.0</version>
+ <version>3.4.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.1.0</ruoyi.version>
+ <ruoyi.version>3.4.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-boot.version>2.5.4</spring-boot.version>
- <spring-cloud.version>2020.0.4</spring-cloud.version>
+ <spring-boot.version>2.6.3</spring-boot.version>
+ <spring-cloud.version>2021.0.0</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
- <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
- <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+ <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
+ <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
<spring-boot.mybatis>2.2.0</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+ <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
<druid.version>1.2.8</druid.version>
- <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <dynamic-ds.version>3.5.0</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
- <velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.78</fastjson.version>
+ <velocity.version>2.3</velocity.version>
+ <fastjson.version>1.2.79</fastjson.version>
+ <jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
- <common-pool.version>2.10.0</common-pool.version>
<commons-collections.version>3.2.2</commons-collections.version>
+ <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
@@ -149,14 +150,8 @@
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Collection 增强Java集合框架 -->
@@ -173,11 +168,18 @@
<version>${fastjson.version}</version>
</dependency>
- <!-- 公共资源池 -->
+ <!-- JWT -->
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>${common-pool.version}</version>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+
+ <!-- 线程传递值 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${transmittable-thread-local.version}</version>
</dependency>
<!-- 核心模块 -->
--
Gitblit v1.9.3