From 2740a2f419d7380c25bc4604557c7584f4fe8f35 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Mon, 24 Nov 2025 22:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=A7=AF=E6=9C=A8=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E7=A7=AF=E6=9C=A8BI=E5=88=B0v2.2.0=E3=80=81p?=
 =?UTF-8?q?oi=E5=8D=87=E7=BA=A7=E5=88=B05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-boot/db/jeecgboot-mysql-5.7.sql         |  7 ++-
 jeecg-boot/jeecg-boot-base-core/pom.xml       | 10 ++++-
 .../jeecg-boot-module-airag/pom.xml           | 10 +++++
 .../jeecg-system-biz/pom.xml                  | 12 -----
 .../sql/mysql/V3.8.3_1__upgrade_jimubi.sql    |  3 ++
 jeecg-boot/pom.xml                            | 45 ++++++++-----------
 6 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_1__upgrade_jimubi.sql

diff --git a/jeecg-boot/db/jeecgboot-mysql-5.7.sql b/jeecg-boot/db/jeecgboot-mysql-5.7.sql
index 65110b5b7..2e9374ab4 100644
--- a/jeecg-boot/db/jeecgboot-mysql-5.7.sql
+++ b/jeecg-boot/db/jeecgboot-mysql-5.7.sql
@@ -9454,4 +9454,9 @@ END
 ;;
 delimiter ;
 
-SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+-- 升级积木BI到V2.2.0版本
+ALTER TABLE `onl_drag_page`
+MODIFY COLUMN `des_json` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '仪表盘主配置JSON' AFTER `cover_url`;
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base-core/pom.xml
index d66eaa877..f1c8e4b2f 100644
--- a/jeecg-boot/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot/jeecg-boot-base-core/pom.xml
@@ -223,6 +223,12 @@
 			<artifactId>shiro-core</artifactId>
 			<classifier>jakarta</classifier>
 			<version>${shiro.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-beanutils</groupId>
+					<artifactId>commons-beanutils</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
@@ -291,8 +297,8 @@
 
 		<!-- AutoPoi Excel工具类-->
 		<dependency>
-			<groupId>org.jeecgframework.boot3</groupId>
-			<artifactId>autopoi-web</artifactId>
+			<groupId>org.jeecgframework</groupId>
+			<artifactId>autopoi-spring-boot-3-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>xerces</groupId>
diff --git a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml
index 82e8829cb..462ae9623 100644
--- a/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml
+++ b/jeecg-boot/jeecg-boot-module/jeecg-boot-module-airag/pom.xml
@@ -74,6 +74,16 @@
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-aiflow</artifactId>
             <version>3.8.3.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- beigin 这两个依赖太多每个包50M左右，如果你发布需要使用，请把<scope>provided</scope>删掉 -->
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
index 2a01534f8..3625618ff 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
@@ -39,12 +39,6 @@
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot3-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.github.jsqlparser</groupId>
-					<artifactId>jsqlparser</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<!-- mongo、redis和文件数据集支持包，按需引入 -->
 		<dependency>
@@ -60,12 +54,6 @@
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimubi-spring-boot3-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.github.jsqlparser</groupId>
-					<artifactId>jsqlparser</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<!-- AI大模型管理 -->
 		<dependency>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_1__upgrade_jimubi.sql b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_1__upgrade_jimubi.sql
new file mode 100644
index 000000000..61b361adb
--- /dev/null
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.8.3_1__upgrade_jimubi.sql
@@ -0,0 +1,3 @@
+-- 升级积木BI到V2.2.0版本
+ALTER TABLE `onl_drag_page`
+MODIFY COLUMN `des_json` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '仪表盘主配置JSON' AFTER `cover_url`;
\ No newline at end of file
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index d0b5a0662..daf4caeb4 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -59,17 +59,17 @@
 		<liteflow.version>2.15.0</liteflow.version>
 		
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>2.1.5</jimureport-spring-boot-starter.version>
-		<jimubi-spring-boot-starter.version>2.1.5</jimubi-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>2.2.0</jimureport-spring-boot-starter.version>
+		<jimubi-spring-boot-starter.version>2.2.0</jimubi-spring-boot-starter.version>
 		<minidao.version>1.10.16</minidao.version>
-		<autopoi-web.version>1.4.18</autopoi-web.version>
+		<autopoi-web.version>2.0.2</autopoi-web.version>
 		
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.12</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.3.1</dynamic-datasource-spring-boot-starter.version>
 		<druid.version>1.2.24</druid.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.18.0</commons-io.version>
 		<commons-fileupload.version>1.5</commons-fileupload.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
@@ -437,6 +437,10 @@
 				<artifactId>jimureport-spring-boot3-starter</artifactId>
 				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
+					<exclusion>
+						<groupId>commons-io</groupId>
+						<artifactId>commons-io</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>com.alibaba</groupId>
 						<artifactId>fastjson</artifactId>
@@ -449,18 +453,10 @@
 						<artifactId>checker-qual</artifactId>
 						<groupId>org.checkerframework</groupId>
 					</exclusion>
-					<exclusion>
-						<artifactId>autopoi-web</artifactId>
-						<groupId>org.jeecgframework</groupId>
-					</exclusion>
 					<exclusion>
 						<artifactId>druid</artifactId>
 						<groupId>com.alibaba</groupId>
 					</exclusion>
-					<exclusion>
-						<artifactId>autopoi</artifactId>
-						<groupId>org.jeecgframework</groupId>
-					</exclusion>
 					<exclusion>
 						<artifactId>jsqlparser</artifactId>
 						<groupId>com.github.jsqlparser</groupId>
@@ -469,8 +465,8 @@
 			</dependency>
 			<!-- AutoPoi Excel工具类-->
 			<dependency>
-				<groupId>org.jeecgframework.boot3</groupId>
-				<artifactId>autopoi-web</artifactId>
+				<groupId>org.jeecgframework</groupId>
+				<artifactId>autopoi-spring-boot-3-starter</artifactId>
 				<version>${autopoi-web.version}</version>
 				<exclusions>
 					<exclusion>
@@ -494,12 +490,8 @@
 						<artifactId>calcite-elasticsearch</artifactId>
 					</exclusion>
 					<exclusion>
-						<artifactId>autopoi-web</artifactId>
-						<groupId>org.jeecgframework</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>autopoi</artifactId>
-						<groupId>org.jeecgframework</groupId>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-text</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>
@@ -516,12 +508,8 @@
                 <version>${jimubi-spring-boot-starter.version}</version>
 				<exclusions>
 					<exclusion>
-						<artifactId>autopoi-web</artifactId>
-						<groupId>org.jeecgframework</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>autopoi</artifactId>
-						<groupId>org.jeecgframework</groupId>
+						<groupId>com.github.jsqlparser</groupId>
+						<artifactId>jsqlparser</artifactId>
 					</exclusion>
 				</exclusions>
             </dependency>
@@ -538,6 +526,11 @@
 				<artifactId>flyway-core</artifactId>
 				<version>7.15.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>1.27.1</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>