From eb96afee64436e886d409b39e1b3035de29b15fb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 04 二月 2023 22:25:49 +0800
Subject: [PATCH] 连接池Druid支持新的配置connectTimeout和socketTimeout
---
pom.xml | 57 +++++++++++++++------------------------------------------
1 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2e1d5e0..15f7562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,32 +6,30 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.7.0</version>
+ <version>3.8.5</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.7.0</ruoyi.version>
+ <ruoyi.version>3.8.5</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.6</druid.version>
+ <druid.version>1.2.15</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
- <kaptcha.version>2.3.2</kaptcha.version>
- <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
- <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
- <fastjson.version>1.2.78</fastjson.version>
- <oshi.version>5.8.0</oshi.version>
- <jna.version>5.8.0</jna.version>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
+ <fastjson.version>2.0.23</fastjson.version>
+ <oshi.version>6.4.0</oshi.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
- <velocity.version>1.7</velocity.version>
+ <velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
</properties>
@@ -43,7 +41,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.13.RELEASE</version>
+ <version>2.5.14</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -62,13 +60,6 @@
<version>${bitwalker.version}</version>
</dependency>
- <!-- SpringBoot集成mybatis框架 -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis-spring-boot.version}</version>
- </dependency>
-
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
@@ -81,18 +72,6 @@
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna.version}</version>
</dependency>
<!-- Swagger3依赖 -->
@@ -132,14 +111,8 @@
<!-- velocity代码生成使用模板 -->
<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>
<!-- collections工具类 -->
@@ -151,8 +124,8 @@
<!-- 阿里JSON解析器 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
@@ -165,7 +138,7 @@
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -242,7 +215,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -253,7 +226,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
--
Gitblit v1.9.2