From ccd87b6ac99259a01b9099a4d570f6d9e7dbb506 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 五月 2025 14:48:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after into li
---
pom.xml | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index c91e139..6f6211f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,10 @@
<jakarta.version>6.0.0</jakarta.version>
<springdoc.version>2.6.0</springdoc.version>
<postgresql.version>42.7.3</postgresql.version>
- <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
+ <mybatis-plus.version>3.5.12</mybatis-plus.version>
<freemarker.version>2.3.30</freemarker.version>
+ <minio.version>8.4.3</minio.version>
+ <okhttp.version>4.9.0</okhttp.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -72,7 +74,7 @@
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
@@ -154,13 +156,6 @@
<version>${ruoyi.version}</version>
</dependency>
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -188,6 +183,26 @@
<version>${postgresql.version}</version>
</dependency>
+ <!-- minio -->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>${minio.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- minio渚濊禆okhttp 涓嶇劧鎶ラ敊 -->
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+
<!--鍩虹妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -205,10 +220,17 @@
<scope>provided</scope>
</dependency>
+ <!-- MyBatis-Plus 鏍稿績渚濊禆 -->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-core</artifactId>
+ <version>3.5.12</version> <!-- 涓庝綘鐨� Spring Boot 鍏煎鐨勭増鏈� -->
+ </dependency>
+
<!--mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -232,7 +254,6 @@
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
</modules>
--
Gitblit v1.9.3