From fcff9dfdea35b2561afce27e5d2013dbd7e79fa2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 08 Jul 2024 16:57:25 +0800
Subject: [PATCH] 修改时间范围日期格式
---
pom.xml | 162 +++++++++++++++++++++++++++++++----------------------
1 files changed, 95 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c46535..509b512 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,43 +6,50 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.1.0</version>
+ <version>3.6.4</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.1.0</ruoyi.version>
+ <ruoyi.version>3.6.4</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-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>
- <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
+ <spring-boot.version>2.7.18</spring-boot.version>
+ <spring-cloud.version>2021.0.8</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
+ <spring-framework.version>5.3.33</spring-framework.version>
+ <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
<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>
- <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>1.7</velocity.version>
- <fastjson.version>1.2.78</fastjson.version>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
+ <druid.version>1.2.23</druid.version>
+ <dynamic-ds.version>4.2.0</dynamic-ds.version>
+ <commons.io.version>2.13.0</commons.io.version>
+ <velocity.version>2.3</velocity.version>
+ <fastjson.version>2.0.43</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.14.4</transmittable-thread-local.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
+
+ <!-- SpringFramework的依赖配置-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- SpringCloud 微服务 -->
<dependency>
@@ -62,13 +69,6 @@
<scope>import</scope>
</dependency>
- <!-- Alibaba Nacos 配置 -->
- <dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
- <version>${alibaba.nacos.version}</version>
- </dependency>
-
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,25 +78,11 @@
<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 依赖配置 -->
@@ -113,7 +99,7 @@
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -139,45 +125,32 @@
<version>${poi.version}</version>
</dependency>
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
-
<!-- 代码生成使用模板 -->
<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集合框架 -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
</dependency>
<!-- JSON 解析器和生成器 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
<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>
<!-- 核心模块 -->
@@ -201,6 +174,13 @@
<version>${ruoyi.version}</version>
</dependency>
+ <!-- 数据脱敏 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-sensitive</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
<!-- 权限范围 -->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -212,6 +192,13 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-datasource</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!-- 分布式事务 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-seata</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -269,6 +256,47 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+ <repositories>
+ <repository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3