|
|
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 |
|
|
|
816eeb9225
|
3.7.0版本合并springboot3分支
本次提交未升级【minidao、仪表盘、online的依赖】
|
2024-06-22 17:03:43 +08:00 |
|
|
|
d44945f688
|
提示语修改
|
2024-06-20 19:34:15 +08:00 |
|
|
|
f370855683
|
还原方法模式的脱敏注解
|
2024-06-20 18:35:34 +08:00 |
|
|
|
c687c7a916
|
修改注解名称
|
2024-06-20 18:03:06 +08:00 |
|
|
|
8e44080b00
|
还原原有数据脱敏功能并新增@Sensitive脱敏注解，不依赖原有数据脱敏功能
|
2024-06-20 17:57:36 +08:00 |
|
|
|
56ca53cc93
|
Merge pull request #6332 from EightMonth/master
优化数据脱敏功能
|
2024-06-20 16:10:02 +08:00 |
|
|
|
7dccaf2ec8
|
优化数据脱敏功能
|
2024-06-19 12:25:34 +08:00 |
|
|
|
ae1b8d4654
|
优化数据脱敏功能
|
2024-06-19 11:15:33 +08:00 |
|
|
|
1a446007c7
|
解决租户角色保存问题 ，多租户模式下，【租户角色】新增角色后，列表中看不到新增记录
|
2024-06-19 10:02:22 +08:00 |
|
|
|
fd7783644f
|
Merge pull request #6329 from EightMonth/master
修复字典导出问题，修复 #6311
|
2024-06-18 22:43:06 +08:00 |
|
|
|
f6a3e11aa2
|
修复字典导出问题，修复 #6311
|
2024-06-18 17:34:42 +08:00 |
|
|
|
2d37b166a2
|
解决：分配权限必须退出重新登录才生效，造成很多用户困扰
|
2024-06-18 16:18:35 +08:00 |
|
|
|
cff5ec5a40
|
解决：分配权限必须退出重新登录才生效，造成很多用户困扰(目前改法缺陷：只针对当前登录人的权限修改生效)
|
2024-06-18 16:04:45 +08:00 |
|
|
|
3a07d5a983
|
分配权限需要退出重新登录，给明确提示
|
2024-06-18 11:34:43 +08:00 |
|
|
|
35ab818741
|
3.7.0 大版本发布
|
2024-06-15 17:33:32 +08:00 |
|
|
|
e00358859c
|
3.7.0 大版本发布（chatgpt依赖放到底层）
|
2024-06-13 16:20:35 +08:00 |
|
|
|
a6b6e7c9d4
|
3.7.0大版本发布
|
2024-06-11 22:58:04 +08:00 |
|
|
|
fd0461644e
|
免token注解@IgnoreAuth改造后， 不需此代码
|
2024-06-05 19:05:16 +08:00 |
|
|
|
10263720d4
|
Merge pull request #6220 from EightMonth/master
修复#6100、#6169、@IgnoreAuth扫描加速
|
2024-06-05 18:18:23 +08:00 |
|
|
|
cddf23c787
|
sas 兼容shiro处理
|
2024-05-31 14:29:21 +08:00 |
|
|
|
70a37309dd
|
sas兼容shiro处理
|
2024-05-22 18:08:31 +08:00 |
|
|
|
06d58f202f
|
增加bug修复注释
|
2024-04-30 14:07:59 +08:00 |
|
|
|
ad3d2eb3fc
|
修复#6169
|
2024-04-30 13:49:34 +08:00 |
|
|
|
72b34d082b
|
修复 #6169
|
2024-04-30 11:53:59 +08:00 |
|
|
|
b46a6438e6
|
修复#6168\#6169\websocket连接问题
|
2024-04-30 11:47:51 +08:00 |
|
|
|
6bc1fe8d21
|
修复#6150，同时修复online表单无法加载问题
|
2024-04-29 17:27:25 +08:00 |
|
|
|
b8162a4a6d
|
修复#6127 #6130
|
2024-04-25 16:01:58 +08:00 |
|
|
|
faebdee755
|
修复#6100、@IgnoreAuth扫描加速
|
2024-04-25 11:52:41 +08:00 |
|
|
|
2fc672dfab
|
写错了
|
2024-04-22 09:35:01 +08:00 |
|
|
|
3091d5b6f0
|
缩小IgnoreAuth注解扫描范围
|
2024-04-08 15:03:13 +08:00 |
|
|
|
94c45f5e0f
|
升级druid v1.2.22版本兼容处理
|
2024-04-08 14:11:39 +08:00 |
|
|
|
c92c9be49a
|
升级druid v1.2.22版本兼容处理
|
2024-04-08 14:04:07 +08:00 |
|
|
|
dbc3f13c65
|
补充注释说明
|
2024-04-08 14:03:27 +08:00 |
|
|
|
b69a716b04
|
修改druid配置类名称
|
2024-04-08 13:45:27 +08:00 |
|
|
|
7e71fa26d7
|
升级druid v1.2.22版本兼容处理
|
2024-04-08 13:11:55 +08:00 |
|
|
|
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 |
|
|
|
2cfc39b23f
|
Merge branch 'master' of https://github.com/EightMonth/jeecg-boot
|
2024-03-22 17:12:32 +08:00 |
|
|
|
c8676b3040
|
优化注解生效范围配置
|
2024-03-22 17:11:18 +08:00 |
|
|
|
73bd04d04a
|
Merge branch 'master' into master
|
2024-03-22 16:38:39 +08:00 |
|
|
|
0ca4badb77
|
修复 #6021
|
2024-03-22 16:37:00 +08:00 |
|
|
|
58865bef28
|
jimureport-drag:2.0.1 报错 java.lang.IllegalStateException: No TaglibFactory available #6021
|
2024-03-20 22:59:27 +08:00 |
|
|
|
c88f9d95d4
|
支持手动生成token
|
2024-03-19 17:16:12 +08:00 |
|
|
|
fee729e16c
|
【回滚】暂时回退mybatisplus、minidao版本，online模块不兼容
|
2024-03-18 14:06:09 +08:00 |
|
|
|
10a3e9c6ba
|
升级knife4j、mybatisplus、justauth、minidao版本
|
2024-03-18 10:11:05 +08:00 |
|
|
|
6360aee0ff
|
【QQYUN-8561】企业微信登陆请求接口设置上下文不一致，导致接口404
|
2024-03-18 09:25:51 +08:00 |
|
|
|
e38e395436
|
Merge branch 'master' into master
|
2024-03-15 15:29:35 +08:00 |
|
|
|
f741db874c
|
移除权限不足异常堆栈，权限加载加入缓存
|
2024-03-15 13:55:58 +08:00 |
|
|
|
364be22dd0
|
新增token校验、客户端便捷工具类、修复登录缺乏租户信息、强退功能失效
|
2024-03-08 16:30:23 +08:00 |
|
|
|
37a38ad288
|
【3.6.3版本发布】升级版本号
|
2024-03-06 17:13:05 +08:00 |
|
