github/JeecgBoot
1
0
Fork 0
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-30 10:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
This commit is contained in:
JEECG 2025-09-28 21:59:14 +08:00
commit 0bfe5689cc
7 changed files with 103573 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.dmp Normal file
View File

Binary file not shown.

29702
jeecg-boot/db/其他数据库脚本/jeecgboot-oracle11g.sql Normal file
View File

File diff suppressed because one or more lines are too long

25749
jeecg-boot/db/其他数据库脚本/jeecgboot-postgresql17.sql Normal file
View File

File diff suppressed because one or more lines are too long

48117
jeecg-boot/db/其他数据库脚本/jeecgboot-sqlserver2017.sql Normal file
View File

File diff suppressed because one or more lines are too long

2
jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/security/SecurityConfig.java
View File

@ -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()

2
jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
View File

@ -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>

6
jeecg-boot/pom.xml
View File

@ -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>