Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
仪表盘大屏分享，提示需要token错误
2026-01-04 04:45:28 +08:00 · 2025-09-28 21:59:14 +08:00 · 2025-09-28 18:12:03 +08:00 · 2025-09-28 14:29:52 +08:00 · 2025-09-26 16:26:35 +08:00 · 2025-09-26 15:26:30 +08:00
7 changed files with 103573 additions and 5 deletions
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.dmp
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.dmp
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.sql
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-postgresql17.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-postgresql17.sql
--- a/jeecg-boot/db/其他数据库脚本/jeecgboot-sqlserver2017.sql
+++ b/jeecg-boot/db/其他数据库脚本/jeecgboot-sqlserver2017.sql
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/SecurityConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/SecurityConfig.java
@ -192,9 +192,9 @@ public class SecurityConfig {
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/jimubi/share/view/**")).permitAll()
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/drag/onlDragDatasetHead/getMapDataByCode")).permitAll()
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/drag/onlDragDatasetHead/getTotalDataByCompId")).permitAll()
+                        .requestMatchers(AntPathRequestMatcher.antMatcher("/drag/onlDragDatasetHead/queryAllById")).permitAll()
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/drag/onlDragDatasetHead/getDictByCodes")).permitAll()
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/dragChannelSocket/**")).permitAll()
-
                        //大屏模板例子
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/test/bigScreen/**")).permitAll()
                        .requestMatchers(AntPathRequestMatcher.antMatcher("/bigscreen/template1/**")).permitAll()
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
@ -38,7 +38,7 @@
 		<!-- 积木报表 -->
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
+			<artifactId>jimureport-spring-boot3-starter</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>com.github.jsqlparser</groupId>
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@ -60,7 +60,7 @@
 		
 		<!-- 积木报表-->
 		<jimureport-spring-boot-starter.version>2.1.3</jimureport-spring-boot-starter.version>
-		<jimubi-spring-boot-starter.version>2.1.3</jimubi-spring-boot-starter.version>
+		<jimubi-spring-boot-starter.version>2.1.4</jimubi-spring-boot-starter.version>
 		<minidao.version>1.10.14</minidao.version>
 		<autopoi-web.version>1.4.18</autopoi-web.version>
 		
@ -436,7 +436,7 @@
 			<!-- 积木报表-->
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
-				<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
+				<artifactId>jimureport-spring-boot3-starter</artifactId>
 				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
 					<exclusion>
@ -489,7 +489,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
 				<artifactId>jimureport-nosql-starter</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.calcite</groupId>
Author	SHA1	Message	Date
JEECG	0bfe5689cc	Merge remote-tracking branch 'origin/springboot3' into springboot3_sas # Conflicts: # jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java	2025-09-28 21:59:14 +08:00
JEECG	ae4363dc72	仪表盘大屏分享，提示需要token错误	2025-09-28 18:12:03 +08:00
JEECG	3e6c7651ee	提供v3.8.3版本数据库脚本	2025-09-28 14:29:52 +08:00
JEECG	c0ffd14b7a	更新 pom.xml，修改 jimureport 依赖的 artifactId	2025-09-26 16:26:35 +08:00
JEECG	914875d6a1	更新 pom.xml，升级 jimubi-spring-boot-starter 和 jimureport-nosql-starter 版本	2025-09-26 15:26:30 +08:00