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 @@ shiro-core jakarta ${shiro.version} + + + commons-beanutils + commons-beanutils + + org.apache.shiro @@ -291,8 +297,8 @@ - org.jeecgframework.boot3 - autopoi-web + org.jeecgframework + autopoi-spring-boot-3-starter xerces 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 @@ org.jeecgframework.boot3 jeecg-aiflow 3.8.3.1 + + + commons-io + commons-io + + + commons-beanutils + commons-beanutils + + 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 @@ org.jeecgframework.jimureport jimureport-spring-boot3-starter - - - com.github.jsqlparser - jsqlparser - - @@ -60,12 +54,6 @@ org.jeecgframework.jimureport jimubi-spring-boot3-starter - - - com.github.jsqlparser - jsqlparser - - 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 @@ 2.15.0 - 2.1.5 - 2.1.5 + 2.2.0 + 2.2.0 1.10.16 - 1.4.18 + 2.0.2 3.5.12 4.3.1 1.2.24 - 2.11.0 + 2.18.0 1.5 2.6 2.1.0 @@ -437,6 +437,10 @@ jimureport-spring-boot3-starter ${jimureport-spring-boot-starter.version} + + commons-io + commons-io + com.alibaba fastjson @@ -449,18 +453,10 @@ checker-qual org.checkerframework - - autopoi-web - org.jeecgframework - druid com.alibaba - - autopoi - org.jeecgframework - jsqlparser com.github.jsqlparser @@ -469,8 +465,8 @@ - org.jeecgframework.boot3 - autopoi-web + org.jeecgframework + autopoi-spring-boot-3-starter ${autopoi-web.version} @@ -494,12 +490,8 @@ calcite-elasticsearch - autopoi-web - org.jeecgframework - - - autopoi - org.jeecgframework + org.apache.commons + commons-text @@ -516,12 +508,8 @@ ${jimubi-spring-boot-starter.version} - autopoi-web - org.jeecgframework - - - autopoi - org.jeecgframework + com.github.jsqlparser + jsqlparser @@ -538,6 +526,11 @@ flyway-core 7.15.0 + + org.apache.commons + commons-compress + 1.27.1 +