From 2a452a00e02dccb5ec65464a52efd019df9bc672 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: Thu, 25 Nov 2021 15:23:46 +0800
Subject: [PATCH] 升级velocity到最新版本2.3（语法升级）
---
pom.xml | 122 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index a3654b9..0baaf10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,36 +6,40 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.4.0</version>
+ <version>3.2.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.4.0</ruoyi.version>
+ <ruoyi.version>3.2.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.3.4.RELEASE</spring-boot.version>
- <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
- <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
- <spring-boot-admin.version>2.3.0</spring-boot-admin.version>
- <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
- <swagger.fox.version>2.9.2</swagger.fox.version>
- <swagger.core.version>1.5.24</swagger.core.version>
- <tobato.version>1.26.5</tobato.version>
+ <spring-boot.version>2.5.6</spring-boot.version>
+ <spring-cloud.version>2020.0.4</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.3</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.0</pagehelper.boot.version>
- <druid.version>1.2.4</druid.version>
- <dynamic-ds.version>3.2.1</dynamic-ds.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.75</fastjson.version>
- <minio.version>8.0.3</minio.version>
- <poi.version>4.1.2</poi.version>
- <common-pool.version>2.6.2</common-pool.version>
+ <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
+ <druid.version>1.2.8</druid.version>
+ <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <commons.io.version>2.11.0</commons.io.version>
+ <commons.fileupload.version>1.4</commons.fileupload.version>
+ <velocity.version>2.3</velocity.version>
+ <fastjson.version>1.2.78</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>
<!-- 依赖声明 -->
@@ -51,13 +55,20 @@
<scope>import</scope>
</dependency>
- <!-- SpringCloud Alibaba 微服务 -->
+ <!-- SpringCloud Alibaba 微服务 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
+ </dependency>
+
+ <!-- Alibaba Nacos 配置 -->
+ <dependency>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ <version>${alibaba.nacos.version}</version>
</dependency>
<!-- SpringBoot 依赖配置 -->
@@ -68,28 +79,28 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
+
<!-- SpringBoot 监控客户端 -->
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring-boot-admin.version}</version>
</dependency>
-
+
<!-- FastDFS 分布式文件系统 -->
<dependency>
<groupId>com.github.tobato</groupId>
<artifactId>fastdfs-client</artifactId>
<version>${tobato.version}</version>
</dependency>
-
+
<!-- Mybatis 依赖配置 -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${spring-boot.mybatis}</version>
</dependency>
-
+
<!-- Swagger 依赖配置 -->
<dependency>
<groupId>io.swagger</groupId>
@@ -140,8 +151,15 @@
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
+ </dependency>
+
+ <!-- Collection 增强Java集合框架 -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
@@ -150,7 +168,21 @@
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
-
+
+ <!-- JWT -->
+ <dependency>
+ <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>
+
<!-- 公共资源池 -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -159,76 +191,80 @@
</dependency>
<!-- 核心模块 -->
- <dependency>
+ <dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-core</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 接口模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-swagger</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 安全模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 权限范围 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datascope</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 多数据源 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 日志记录 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-log</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 缓存服务 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-redis</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 系统接口 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-system</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
<modules>
- <module>ruoyi-auth</module>
- <module>ruoyi-gateway</module>
- <module>ruoyi-visual</module>
- <module>ruoyi-modules</module>
- <module>ruoyi-api</module>
- <module>ruoyi-common</module>
+ <module>ruoyi-auth</module>
+ <module>ruoyi-gateway</module>
+ <module>ruoyi-visual</module>
+ <module>ruoyi-modules</module>
+ <module>ruoyi-api</module>
+ <module>ruoyi-common</module>
</modules>
<packaging>pom</packaging>
<dependencies>
-
+ <!-- bootstrap 启动器 -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ </dependency>
</dependencies>
<build>
--
Gitblit v1.9.3