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

214 Commits (e9d05b0e75b96287128a588f6f2938c745da2748)

Author SHA1 Message Date
JEECG 6ade7e22f8 积木报表扩展实现类放开注释 2024-06-22 20:06:13 +08:00
JEECG 43d47c08cb 【jeecgboot 3.7.0里程碑版本发布——合并springboot3sas分支】 
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts:
#	.gitignore
#	db/tables_nacos.sql
#	jeecg-boot-base-core/pom.xml
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
#	pom.xml
 2024-06-22 19:55:35 +08:00
JEECG 816eeb9225 3.7.0版本合并springboot3分支 
本次提交未升级【minidao、仪表盘、online的依赖】
 2024-06-22 17:03:43 +08:00
JEECG d44945f688 提示语修改 2024-06-20 19:34:15 +08:00
JEECG 335c369546 提示语修改 2024-06-19 10:02:33 +08:00
JEECG fd7783644f
Merge pull request #6329 from EightMonth/master 
修复字典导出问题，修复 #6311
 2024-06-18 22:43:06 +08:00
EightMonth f6a3e11aa2 修复字典导出问题，修复 #6311 2024-06-18 17:34:42 +08:00
JEECG 2d37b166a2 解决：分配权限必须退出重新登录才生效，造成很多用户困扰 2024-06-18 16:18:35 +08:00
JEECG cff5ec5a40 解决：分配权限必须退出重新登录才生效，造成很多用户困扰(目前改法缺陷：只针对当前登录人的权限修改生效) 2024-06-18 16:04:45 +08:00
JEECG 0947a199b6 补充遗漏的权限配置 2024-06-18 16:03:44 +08:00
JEECG 6147e923de 3.7.0 大版本发布（调整增量sql,如果大家报错手工执行并改下表flyway_schema_history的状态） 2024-06-18 11:58:06 +08:00
JEECG 3a07d5a983 分配权限需要退出重新登录，给明确提示 2024-06-18 11:34:43 +08:00
JEECG 2747868ea7 3.7.0 大版本发布（优化代码生成器模板） 2024-06-17 17:50:59 +08:00
JEECG dcc27d71b4 1 2024-06-17 16:33:19 +08:00
JEECG 30c0482b6d 遗漏升级sql 2024-06-17 16:33:06 +08:00
JEECG 641298b32d 补充积木报表缺少的升级sql 2024-06-17 16:31:02 +08:00
JEECG ee497a8d1e 3.7.0 大版本发布（代码生成器模板大升级） 2024-06-13 14:30:24 +08:00
JEECG b45e75007b 3.7.0 大版本发布 2024-06-13 11:43:50 +08:00
JEECG 52ae0c359e 3.7.0 大版本发布（补充online所需接口权限） 2024-06-13 10:51:46 +08:00
JEECG 73d62b484c 3.7.0 大版本发布（仪表盘模块升级） 2024-06-12 18:49:38 +08:00
JEECG 0ff93a220d 3.7.0 大版本发布（仪表盘模块升级） 2024-06-12 18:49:24 +08:00
JEECG a6b6e7c9d4 3.7.0大版本发布 2024-06-11 22:58:04 +08:00
JEECG 10263720d4
Merge pull request #6220 from EightMonth/master 
修复#6100、#6169、@IgnoreAuth扫描加速
 2024-06-05 18:18:23 +08:00
EightMonth 70a37309dd sas兼容shiro处理 2024-05-22 18:08:31 +08:00
JEECG fbc312c35d
Merge pull request #6173 from EightMonth/springboot3 
修复#6127 #6130
 2024-04-25 20:04:26 +08:00
EightMonth b8162a4a6d 修复#6127 #6130 2024-04-25 16:01:58 +08:00
EightMonth faebdee755 修复#6100、@IgnoreAuth扫描加速 2024-04-25 11:52:41 +08:00
JEECG 4dc4e87900 解决SQL注入检测逻辑影响业务 #6105 2024-04-20 18:34:52 +08:00
JEECG 13d00a8bb4 【issues/6113】online表单生成代码， 关联表生成vue3模板里的 *.data.ts 这个文件会有报错 2024-04-17 10:43:19 +08:00
JEECG 200adb8490 使用代码生成器生成树的结构，批量删除时报错，在很老的jeecg,vue2版本就在报错了 #6043 2024-04-12 15:42:37 +08:00
JEECG 7b06715bff 排除minidao的子依赖jsqlparser和druid，总与mybatisplus冲突 2024-04-11 11:13:39 +08:00
JEECG ea6927a2a7
Merge pull request #6007 from EightMonth/master 
修复 #5901
 2024-04-08 13:52:58 +08:00
EightMonth 6fc34d8a39
升级druid1.2.22版本兼容处理 2024-04-03 16:18:31 +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 c9c6dd5c1d Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" #5978 
字典下拉异步出错 #1108
 2024-03-28 14:44:24 +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
EightMonth 73bd04d04a
Merge branch 'master' into master 2024-03-22 16:38:39 +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 990f79fdfe 调整flyway配置，检查数据库类型只有mysql才启用 2024-03-18 09:27:54 +08:00
EightMonth f741db874c 移除权限不足异常堆栈，权限加载加入缓存 2024-03-15 13:55:58 +08:00
zhangdaiscott b15e6e0422 【优化代码生成功能】uniapp调整目录 2024-03-09 22:30:41 +08:00