From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
pom.xml | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c3873f..e7c41a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<fastjson.version>2.0.53</fastjson.version>
<oshi.version>6.6.5</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.2.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<!-- override dependency version -->
@@ -45,12 +45,17 @@
<hutool.version>5.8.18</hutool.version>
<easyexcel.version>3.3.2</easyexcel.version>
<poi.tl.version>1.12.2</poi.tl.version>
+ <amqp.version>3.2.6</amqp.version>
</properties>
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
-
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-amqp</artifactId>
+ <version>${amqp.version}</version>
+ </dependency>
<!-- 瑕嗙洊SpringFramework鐨勪緷璧栭厤缃�-->
<dependency>
<groupId>org.springframework</groupId>
@@ -200,20 +205,6 @@
<version>${kaptcha.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -267,6 +258,27 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>cnas-process</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas鏍囧噯鐗╄川-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-require</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas璁惧绠＄悊-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-device</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!--cnas浜哄憳-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-personnel</artifactId>
<version>${ruoyi.version}</version>
</dependency>
@@ -377,14 +389,16 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
<module>inspect-server</module>
<module>performance-server</module>
<module>cnas-manage</module>
<module>cnas-process</module>
+ <module>cnas-require</module>
+ <module>cnas_server</module>
+ <module>cnas-device</module>
+ <module>cnas-personnel</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3