From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
pom.xml | 96 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8f6728..fde8430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,25 +14,26 @@
<properties>
<revision>1.0.0</revision>
- <spring-boot.version>3.0.6</spring-boot.version>
+ <spring-boot.version>3.4.4</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
- <spring-boot.mybatis>3.0.1</spring-boot.mybatis>
+ <mysql.version>8.0.33</mysql.version>
+ <mybatis.version>3.5.16</mybatis.version>
<springdoc.version>2.1.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
<easyexcel.version>3.2.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.34.0</satoken.version>
- <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
+ <mybatis-plus.version>3.5.11</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.18</hutool.version>
+ <hutool.version>5.8.35</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
+ <dynamic-ds.version>4.3.1</dynamic-ds.version>
<spring-boot-admin.version>3.0.3</spring-boot-admin.version>
<redisson.version>3.20.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>3.6.1</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<xxl-job.version>2.4.0</xxl-job.version>
<mapstruct-plus.version>1.2.1</mapstruct-plus.version>
@@ -41,10 +42,6 @@
<bouncycastle.version>1.72</bouncycastle.version>
<!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
<ip2region.version>2.7.0</ip2region.version>
-
- <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <snakeyaml.version>1.33</snakeyaml.version>
-
<!-- OSS 閰嶇疆 -->
<aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
@@ -59,6 +56,7 @@
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
<weixin-java-miniapp.version>4.5.0</weixin-java-miniapp.version>
<weixin-java-pay.version>4.6.0</weixin-java-pay.version>
+ <weixin-java-cp.version>4.6.0</weixin-java-cp.version>
<weixin-java-cp.version>4.6.0</weixin-java-cp.version>
</properties>
@@ -95,6 +93,12 @@
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ </dependency>
<!-- SpringBoot鐨勪緷璧栭厤缃�-->
<dependency>
@@ -194,22 +198,22 @@
<version>${satoken.version}</version>
</dependency>
- <!-- dynamic-datasource 澶氭暟鎹簮-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${dynamic-ds.version}</version>
- </dependency>
<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${spring-boot.mybatis}</version>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>${mybatis.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-jsqlparser</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -217,6 +221,13 @@
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+ <version>${dynamic-ds.version}</version>
</dependency>
<!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
@@ -244,18 +255,6 @@
<version>${tencent.sms.version}</version>
</dependency>
- <!-- <dependency>-->
- <!-- <groupId>de.codecentric</groupId>-->
- <!-- <artifactId>spring-boot-admin-starter-server</artifactId>-->
- <!-- <version>${spring-boot-admin.version}</version>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>de.codecentric</groupId>-->
- <!-- <artifactId>spring-boot-admin-starter-client</artifactId>-->
- <!-- <version>${spring-boot-admin.version}</version>-->
- <!-- </dependency>-->
-
- <!--redisson-->
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
@@ -279,13 +278,6 @@
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>${alibaba-ttl.version}</version>
- </dependency>
-
- <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
</dependency>
<!-- 鍔犲瘑鍖呭紩鍏� -->
@@ -321,10 +313,21 @@
<version>${revision}</version>
</dependency>
+ <dependency>
+ <groupId>org.ruoyi</groupId>
+ <artifactId>ruoyi-knowledge-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
<dependency>
<groupId>org.ruoyi</groupId>
- <artifactId>ruoyi-knowledge</artifactId>
+ <artifactId>ruoyi-chat-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ruoyi</groupId>
+ <artifactId>ruoyi-system-api</artifactId>
<version>${revision}</version>
</dependency>
@@ -334,20 +337,23 @@
<version>${revision}</version>
</dependency>
- <dependency>
- <groupId>org.ruoyi</groupId>
- <artifactId>ruoyi-demo</artifactId>
- <version>${revision}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.ruoyi</groupId>-->
+<!-- <artifactId>ruoyi-demo</artifactId>-->
+<!-- <version>${revision}</version>-->
+<!-- </dependency>-->
</dependencies>
</dependencyManagement>
<modules>
- <module>ruoyi-admin</module>
<module>ruoyi-common</module>
<module>ruoyi-modules</module>
+ <module>ruoyi-modules-api</module>
+ <module>ruoyi-admin</module>
+ <module>ruoyi-extend</module>
</modules>
+
<packaging>pom</packaging>
<build>
--
Gitblit v1.9.3