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

1304 Commits (1632c241eeb6118287c3637dcab54ad86514218e)

Author SHA1 Message Date
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
JEECG 685b81e5ec
Merge pull request #5930 from EightMonth/master 
处理 #5601 ，添加@ignoreAuth注解
 2024-03-15 15:30:48 +08:00
EightMonth e38e395436
Merge branch 'master' into master 2024-03-15 15:29:35 +08:00
EightMonth f741db874c 移除权限不足异常堆栈，权限加载加入缓存 2024-03-15 13:55:58 +08:00
JEECG d684c09392
Merge pull request #5965 from EightMonth/springboot3_sas 
新增token校验、客户端便捷工具类、修复登录缺乏租户信息、强退功能失效
 2024-03-12 14:27:11 +08:00
zhangdaiscott 39af6e25ee ChatGPT AI助手，对接配置文档 2024-03-11 19:08:33 +08:00
zhangdaiscott b15e6e0422 【优化代码生成功能】uniapp调整目录 2024-03-09 22:30:41 +08:00
zhangdaiscott 8f99a80352 【优化代码生成功能】uniapp调整目录、升级sql的命名改成flyway规则 2024-03-09 22:11:00 +08:00
EightMonth 364be22dd0 新增token校验、客户端便捷工具类、修复登录缺乏租户信息、强退功能失效 2024-03-08 16:30:23 +08:00
zhangdaiscott 936a87e738 积木报表 v1.7.2 紧急发布，修复 1.7.1 严重 Bug 2024-03-07 22:32:39 +08:00
zhangdaiscott 2af165b201 【3.6.3版本发布】初始化sql有问题启动报flyway错误 2024-03-07 11:30:51 +08:00
zhangdaiscott 3d5efc07ad 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 19:02:39 +08:00
zhangdaiscott 21e8d640d2 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:55:35 +08:00
zhangdaiscott b0ce456909 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:45:44 +08:00
zhangdaiscott b8e1306955 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:44:35 +08:00
zhangdaiscott 37a38ad288 【3.6.3版本发布】升级版本号 2024-03-06 17:13:05 +08:00
zhangdaiscott 9ee05c9510 【3.6.3版本发布】新版数据库脚本 2024-03-06 17:00:54 +08:00
zhangdaiscott 275a68bb6a 忽略文件 2024-03-06 16:24:23 +08:00
zhangdaiscott f3f70e8549 【3.6.3版本发布】代码修复 2024-03-06 16:22:36 +08:00