github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,322 Commits
3 Branches
68 Tags
146 MiB
Commit Graph

1322 Commits (e93dcc1a7e90b58108d07b84bfc49381dbddba0a)

Author SHA1 Message Date
JEECG 78f048fda5 增加新QQ群⑨808791225 2024-04-15 13:50:00 +08:00
JEECG 200adb8490 使用代码生成器生成树的结构，批量删除时报错，在很老的jeecg,vue2版本就在报错了 #6043 2024-04-12 15:42:37 +08:00
EightMonth f1496b5084 rocketmq-starter应用举例 2024-04-12 10:16:30 +08:00
JEECG 7b06715bff 排除minidao的子依赖jsqlparser和druid，总与mybatisplus冲突 2024-04-11 11:13:39 +08:00
JEECG 28404d2fd3
Merge pull request #6091 from EightMonth/springboot3 
升级druid v1.2.22版本兼容处理
 2024-04-08 15:26:49 +08:00
JEECG 46b026b989
Merge pull request #6092 from EightMonth/springboot3_sas 
升级druid v1.2.22版本兼容处理
 2024-04-08 15:26:41 +08:00
JEECG 3091d5b6f0 缩小IgnoreAuth注解扫描范围 2024-04-08 15:03:13 +08:00
JEECG c117abb2d4 升级druid到1.2.22 2024-04-08 14:23:49 +08:00
EightMonth 94c45f5e0f 升级druid v1.2.22版本兼容处理 2024-04-08 14:11:39 +08:00
EightMonth c92c9be49a 升级druid v1.2.22版本兼容处理 2024-04-08 14:04:07 +08:00
JEECG dbc3f13c65 补充注释说明 2024-04-08 14:03:27 +08:00
JEECG ea6927a2a7
Merge pull request #6007 from EightMonth/master 
修复 #5901
 2024-04-08 13:52:58 +08:00
EightMonth b69a716b04 修改druid配置类名称 2024-04-08 13:45:27 +08:00
EightMonth 7e71fa26d7 升级druid v1.2.22版本兼容处理 2024-04-08 13:11:55 +08:00
JEECG 58e85e0569
Merge pull request #6081 from EightMonth/springboot3 
升级druid1.2.22版本兼容处理
 2024-04-03 16:35:30 +08:00
EightMonth 6fc34d8a39
升级druid1.2.22版本兼容处理 2024-04-03 16:18:31 +08:00
EightMonth 4fed40ff7d
Update pom.xml 2024-04-03 16:06:04 +08:00
EightMonth ee4ff35c90 Revert "修复 #6070" 
This reverts commit 6edef14f07.
 2024-04-03 16:04:29 +08:00
EightMonth c9b92decaf Revert "处理升级druid 1.2.22版本兼容处理" 
This reverts commit eed3bc346d.
 2024-04-03 16:04:23 +08:00
EightMonth eed3bc346d 处理升级druid 1.2.22版本兼容处理 2024-04-03 16:01:39 +08:00
EightMonth 6edef14f07 修复 #6070 2024-04-03 11:18:47 +08:00
JEECG ab49983759 回滚druid版本升级，导致问题“角色功能报错，列表查询报错。 #6070” 2024-04-03 09:44:01 +08:00
EightMonth 5a09a6fb4a
Merge branch 'master' into master 2024-04-02 15:43:35 +08:00
JEECG ac93bf7d6b 升级积木报表到1.7.4，升级druid到1.2.22 2024-04-01 13:47:48 +08:00
JEECG 790df934b5 Merge branch 'springboot3' of https://github.com/jeecgboot/jeecg-boot into springboot3 
 Conflicts:
	pom.xml
 2024-03-30 23:39:54 +08:00
JEECG c9c6dd5c1d Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" #5978 
字典下拉异步出错 #1108
 2024-03-28 14:44:24 +08:00
EightMonth e3e1cd6b0d 修复 #5936 2024-03-25 16:27:53 +08:00
JEECG 8aee4011a2
Merge pull request #6036 from EightMonth/springboot3 
合并master变更，升级 3.6.3
 2024-03-25 15:32:01 +08:00
JEECG 8950e19d4e
Merge pull request #6037 from EightMonth/springboot3_sas 
修复 #5936
 2024-03-25 15:00:06 +08:00
EightMonth 99eb88f71c 修复 #5936 2024-03-25 14:44:23 +08:00
EightMonth 6e0277c60a 升级druid版本，修复 #5936 2024-03-25 14:37:00 +08:00
EightMonth e923654161 升级jimu版本至1.7.3，屏蔽flyway 2024-03-25 10:52:37 +08:00
JEECG f3cf90bd28 在租户不隔离的情况下导出部门报错 2024-03-25 09:42:33 +08:00
EightMonth 06b41ae479 Merge branch 'master' into springboot3 
# Conflicts:
#	db/tables_nacos.sql
#	jeecg-boot-base-core/pom.xml
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
#	jeecg-module-system/jeecg-system-start/pom.xml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
#	jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
#	jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	pom.xml
 2024-03-25 09:39:13 +08:00
JEECG 70847d17f1 升级积木报表版本 2024-03-23 21:22:29 +08:00
EightMonth 2cfc39b23f Merge branch 'master' of https://github.com/EightMonth/jeecg-boot 2024-03-22 17:12:32 +08:00
EightMonth c8676b3040 优化注解生效范围配置 2024-03-22 17:11:18 +08:00
EightMonth 73bd04d04a
Merge branch 'master' into master 2024-03-22 16:38:39 +08:00
EightMonth 0ca4badb77 修复 #6021 2024-03-22 16:37:00 +08:00
JEECG 80b92ca132 flowable、activiti都支持 2024-03-22 16:22:48 +08:00
JEECG 824d7839d8
Merge pull request #6014 from EightMonth/springboot3_sas 
支持手动生成token
 2024-03-22 16:18:29 +08:00
JEECG 58865bef28 jimureport-drag:2.0.1 报错 java.lang.IllegalStateException: No TaglibFactory available #6021 2024-03-20 22:59:27 +08:00
JEECG 9fd40d0973 代码生成器jar包中携带配置文件导致 spring.profiles.active 被覆盖 #6010 2024-03-20 10:07:54 +08:00
EightMonth c88f9d95d4 支持手动生成token 2024-03-19 17:16:12 +08:00
EightMonth 266ebd9122 修复 #5901 2024-03-19 09:41:29 +08:00
JEECG fee729e16c 【回滚】暂时回退mybatisplus、minidao版本，online模块不兼容 2024-03-18 14:06:09 +08:00
JEECG 10a3e9c6ba 升级knife4j、mybatisplus、justauth、minidao版本 2024-03-18 10:11:05 +08:00
JEECG 990f79fdfe 调整flyway配置，检查数据库类型只有mysql才启用 2024-03-18 09:27:54 +08:00
JEECG 6360aee0ff 【QQYUN-8561】企业微信登陆请求接口设置上下文不一致，导致接口404 2024-03-18 09:25:51 +08:00
JEECG beb0bc2f64
Merge pull request #5995 from EightMonth/springboot3_sas 
移除权限不足异常堆栈，权限加载加入缓存
 2024-03-15 17:06:05 +08:00