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

1468 Commits (a10a2e0a9da252a7e1d9dc7929936f6c96dbb11a)

Author SHA1 Message Date
JEECG 9e25566271 【重要更新】vue3前端为了适配springboot3 sas分支(Spring Authorization Server)特定修改 2024-06-23 11:25:55 +08:00
JEECG 8e54e06978 Merge remote-tracking branch 'origin/springboot3' into springboot3_sas 2024-06-23 11:23:34 +08:00
JEECG 8ac6989d2c Merge remote-tracking branch 'origin/master' into springboot3 2024-06-23 11:22:06 +08:00
JEECG c30218f17a 更新README.md 2024-06-23 11:17:26 +08:00
JEECG 21711e5f0c 更新README.md 2024-06-23 11:13:15 +08:00
JEECG 4368b4ce1e 前端和后端源码合并后，更新readme.md 2024-06-23 11:05:09 +08:00
JEECG 03f922376e 前端和后端源码合并后，更新readme.md 2024-06-23 10:56:48 +08:00
JEECG 0325e34dcb 前端和后端源码，合并到一个git仓库中，方便用户下载，避免前后端不匹配的问题 2024-06-23 10:39:52 +08:00
JEECG e5c082ae13 版本合并前端和后端放到一起 2024-06-23 10:35:53 +08:00
JEECG 96ab98ac3e Merge remote-tracking branch 'origin/springboot3' into springboot3_sas 
# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java
 2024-06-23 10:29:34 +08:00
JEECG 402ab0ffc4 补充合并丢失的代码 2024-06-23 10:27:33 +08:00
JEECG 7778ede90e Merge remote-tracking branch 'origin/master' into springboot3 
# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
 2024-06-23 10:23:56 +08:00
JEECG bb918b742e 前端代码和后端代码合并到一个仓库中 2024-06-23 10:09:17 +08:00
JEECG 1632c241ee 修改nacos命名空间springboot3的id也是springboot3，方便理解 2024-06-22 23:23:55 +08:00
JEECG 06144206df 修改nacos命名空间springboot3的id也是springboot3，方便理解 2024-06-22 23:23:05 +08:00
JEECG e9d05b0e75 访问积木报表提示token无权限，原因TokenUtils.getLoginUser方法报错 2024-06-22 22:59:34 +08:00
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 3d3b5850ad online的依赖升级个小版本号 2024-06-22 17:18:59 +08:00
JEECG 816eeb9225 3.7.0版本合并springboot3分支 
本次提交未升级【minidao、仪表盘、online的依赖】
 2024-06-22 17:03:43 +08:00
JEECG 0b42efbbbf Merge remote-tracking branch 'origin/springboot3' into springboot3 2024-06-22 14:58:29 +08:00
JEECG 56da1a23c2 更新issue格式要求 2024-06-21 17:08:37 +08:00
JEECG d3c5a58db9 更新README 2024-06-21 15:19:53 +08:00
JEECG d44945f688 提示语修改 2024-06-20 19:34:15 +08:00
JEECG f370855683 还原方法模式的脱敏注解 2024-06-20 18:35:34 +08:00
JEECG c582efd115
Merge pull request #6339 from EightMonth/master 
还原原有数据脱敏功能并新增@sensitive脱敏注解，不依赖原有数据脱敏功能
 2024-06-20 18:11:55 +08:00
EightMonth c687c7a916
修改注解名称 2024-06-20 18:03:06 +08:00
EightMonth 8e44080b00
还原原有数据脱敏功能并新增@Sensitive脱敏注解，不依赖原有数据脱敏功能 2024-06-20 17:57:36 +08:00
JEECG 56ca53cc93
Merge pull request #6332 from EightMonth/master 
优化数据脱敏功能
 2024-06-20 16:10:02 +08:00
JEECG e616c5d8fe
Merge pull request #6243 from EightMonth/springboot3_sas 
sas兼容shiro处理
 2024-06-20 16:09:29 +08:00
JEECG 0075ec6751 更新README 2024-06-19 18:06:56 +08:00
JEECG 7e31341f1a 更新readme 2024-06-19 18:03:42 +08:00
JEECG d4ca2eb934 项目地址修改 2024-06-19 17:15:20 +08:00
JEECG 84946888ad 更新readme 2024-06-19 15:49:49 +08:00
JEECG d276c3d8ad 更新readme 2024-06-19 15:25:48 +08:00
EightMonth 7dccaf2ec8 优化数据脱敏功能 2024-06-19 12:25:34 +08:00
EightMonth ae1b8d4654 优化数据脱敏功能 2024-06-19 11:15:33 +08:00
JEECG 49f709a32a 升级积木报表到最新版1.7.6 2024-06-19 11:03:31 +08:00
JEECG 335c369546 提示语修改 2024-06-19 10:02:33 +08:00
JEECG 1a446007c7 解决租户角色保存问题 ，多租户模式下，【租户角色】新增角色后，列表中看不到新增记录 2024-06-19 10:02:22 +08:00
JEECG 76f9575140 3.7.0 大版本发布（更新数据库） 2024-06-18 23:13:43 +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 c2768cea85 解决[数据表jimu_report_data_source，字段connect_times的类型问题 #6316] 2024-06-18 16:27:37 +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 2ecfe74b33 补充遗留的权限配置 2024-06-18 12:03:14 +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