From 8a0a3a03fe927a1b6f29c0cd0d168cf7724c3f18 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 30 八月 2024 21:46:03 +0800
Subject: [PATCH] 升级oshi到最新版本6.6.3
---
pom.xml | 71 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index c95045b..7605f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,43 +6,60 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.8.4</version>
+ <version>3.8.8</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.8.4</ruoyi.version>
+ <ruoyi.version>3.8.8</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.11</druid.version>
+ <spring-framework.version>5.3.33</spring-framework.version>
+ <spring-security.version>5.7.12</spring-security.version>
+ <druid.version>1.2.23</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.2.2</mybatis-spring-boot.version>
- <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
- <fastjson.version>2.0.14</fastjson.version>
- <oshi.version>6.2.2</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>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
+ <fastjson.version>2.0.43</fastjson.version>
+ <oshi.version>6.6.3</oshi.version>
+ <commons.io.version>2.13.0</commons.io.version>
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.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>
+
+ <!-- SpringSecurity的依赖配置-->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId>
+ <version>${spring-security.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.5.14</version>
+ <version>2.5.15</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -59,13 +76,6 @@
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<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 分页插件 -->
@@ -102,13 +112,6 @@
<version>${commons.io.version}</version>
</dependency>
- <!-- 文件上传工具类 -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons.fileupload.version}</version>
- </dependency>
-
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -121,13 +124,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- </dependency>
-
- <!-- collections工具类 -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
@@ -146,7 +142,7 @@
<!-- 验证码 -->
<dependency>
- <groupId>com.github.penggle</groupId>
+ <groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
@@ -198,11 +194,6 @@
<module>ruoyi-common</module>
</modules>
<packaging>pom</packaging>
-
-
- <dependencies>
-
- </dependencies>
<build>
<plugins>
--
Gitblit v1.9.2