lilong
|
dbc716ce2e
|
Merge remote-tracking branch 'origin/feature/REQ-3010' into release-20241030
# Conflicts:
# tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
# tyr-server/pom.xml
# tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
# tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
# tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
# tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
|
2024-10-30 15:00:07 +08:00 |
|
李龙
|
afa65a1ebd
|
Merge branch 'release/20241028' into 'master'
feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题
See merge request universal/infrastructure/backend/tyr!273
|
2024-10-28 07:55:24 +00:00 |
|
lilong
|
9ebfdd6f75
|
feat: merge
|
2024-10-28 11:21:55 +08:00 |
|
lilong
|
15fdf458df
|
Merge remote-tracking branch 'origin/feature/REQ-3034' into release/20241028
# Conflicts:
# tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
|
2024-10-28 11:19:39 +08:00 |
|
lilong
|
e4ecfd3fd1
|
Merge remote-tracking branch 'origin/feature/REQ-2750-1' into release/20241028
# Conflicts:
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
|
2024-10-28 11:16:23 +08:00 |
|
李龙
|
f83d6c1331
|
Merge branch 'feature/REQ-2750' into 'release/20241028'
feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题
See merge request universal/infrastructure/backend/tyr!270
|
2024-10-28 03:10:39 +00:00 |
|
lilong
|
784db6f298
|
feat: (feature/REQ-2750) 1、解决组件资源更新时groupCode被覆盖成code的问题
2、解决查询项目下有权限的人无法查询出admin角色的人的问题
|
2024-10-25 11:01:52 +08:00 |
|
lilong
|
19ae1ee0d0
|
Merge remote-tracking branch 'origin/master' into feature/REQ-2750
# Conflicts:
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
# tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
|
2024-10-25 10:45:25 +08:00 |
|
lilong
|
f10a3a91f3
|
feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
|
2024-10-17 15:46:12 +08:00 |
|
李龙
|
3e80c801c9
|
Merge branch 'release/20241016' into 'master'
Release/20241016
See merge request universal/infrastructure/backend/tyr!260
|
2024-10-16 10:25:46 +00:00 |
|
lilong
|
2ae3650cd4
|
Merge remote-tracking branch 'origin/feature/REQ-3068' into release/20241016
|
2024-10-16 16:13:35 +08:00 |
|
lilong
|
540a7710ba
|
Merge remote-tracking branch 'origin/feature/REQ-2968' into release/20241016
# Conflicts:
# tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java
|
2024-10-16 16:13:18 +08:00 |
|
lilong
|
0a3813338a
|
feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
|
2024-10-16 13:37:04 +08:00 |
|
lilong
|
98f11500ba
|
feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
|
2024-10-16 10:16:34 +08:00 |
|
lilong
|
c666edfaa6
|
feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
|
2024-10-15 17:15:03 +08:00 |
|
chenwenjian
|
60859f99c5
|
Merge remote-tracking branch 'origin/feature/REQ-3010' into feature/REQ-3010
|
2024-10-14 19:57:35 +08:00 |
|
chenwenjian
|
d327cb7735
|
feat(REQ-3010): 请求方式调整
|
2024-10-14 19:57:26 +08:00 |
|
lilong
|
ab6c9365c5
|
feat: (feature/REQ-3010) 迁移pudge代码
|
2024-10-14 19:46:18 +08:00 |
|
chenwenjian
|
de0b6d1b80
|
feat(REQ-3010): 请求类型调整
|
2024-10-14 19:40:56 +08:00 |
|
chenwenjian
|
3eaa81f435
|
feat(REQ-3010): 新增getUserRoleExListMapByIdentityIdAndWorkspaceId接口
cn.axzo.tyr.client.feign.SaasRoleApi#getUserRoleExListMapByIdentityIdAndWorkspaceId
|
2024-10-14 18:09:10 +08:00 |
|
lilong
|
7a43be540c
|
feat: (feature/REQ-3010) 迁移超管查询接口
|
2024-10-14 11:09:27 +08:00 |
|
lilong
|
18605180ce
|
feat: (feature/REQ-3010) 迁移超管查询接口
|
2024-10-14 10:07:07 +08:00 |
|
lilong
|
abc4445fec
|
feat: (feature/REQ-3034) 修改临时接口支持已删除和未删除的同时查询
|
2024-10-14 09:53:22 +08:00 |
|
chenwenjian
|
3501abf019
|
feat(REQ-3010): 还原basics-auth-api依赖引用
|
2024-10-14 09:30:33 +08:00 |
|
lilong
|
c99fe23c65
|
feat: (feature/REQ-2750-1) 修改超管角色查询
|
2024-10-12 18:37:26 +08:00 |
|
lilong
|
bed47b058b
|
feat: (feature/REQ-3034) 修改临时接口支持一直要查询未删除用户
|
2024-10-12 18:12:03 +08:00 |
|
lilong
|
f414070272
|
feat: (feature/REQ-3068) 提供新接口优化，原接口引用地方太多，需要回归的地方太多
|
2024-10-12 11:40:34 +08:00 |
|
lilong
|
3272ae9df5
|
feat:(REQ-3010) 迁移pudge接口
|
2024-10-12 10:56:28 +08:00 |
|
lilong
|
b1f98935f9
|
feat:(REQ-3068) 修改异常打印规范
|
2024-10-12 09:25:21 +08:00 |
|
lilong
|
4d32932391
|
feat:(REQ-3068) 修改异常打印规范
|
2024-10-11 18:53:08 +08:00 |
|
lilong
|
9ae581f5fb
|
feat:(REQ-3068) 解决新菜单跟菜单端重复的问题
|
2024-10-11 18:42:17 +08:00 |
|
lilong
|
0e9e269f4b
|
feat:(REQ-3068) 解决查询人员角色时，只给ouId的情况
|
2024-10-11 17:13:24 +08:00 |
|
lilong
|
d766af05aa
|
feat:(REQ-3068) 新增批量判断是否有应用权限的接口
|
2024-10-11 14:44:43 +08:00 |
|
lilong
|
8870a1830d
|
feat:(REQ-3068) 优化人员查询接口
|
2024-10-11 13:43:25 +08:00 |
|
lilong
|
c47f41291d
|
feat:(REQ-2750) 角色tree接口增加ouType
|
2024-10-11 11:10:28 +08:00 |
|
lilong
|
bd0f4e83d1
|
feat:(REQ-3068) 修改原用户查询角色接口，解决循环查询导致接口性能差的问题
|
2024-10-11 11:04:54 +08:00 |
|
lilong
|
4e76df29f5
|
feat:(feature/REQ-2750-1) 修改刷超管角色的接口
|
2024-10-09 21:06:11 +08:00 |
|
lilong
|
a995ae4fef
|
feat:(feature/REQ-3010) 迁移pudge 权限相关接口
|
2024-10-09 20:04:12 +08:00 |
|
lilong
|
63f339ef4a
|
feat:(feature/REQ-3010) 迁移pudge 权限相关接口
|
2024-10-09 14:45:17 +08:00 |
|
lilong
|
5390a9b9f1
|
feat:(feature/REQ-2750-1) 改造list接口，支持超管角色合并
|
2024-10-09 14:13:02 +08:00 |
|
lilong
|
e34157104b
|
feat:(feature/REQ-2750-1) 改造list接口，支持超管角色合并
|
2024-10-09 10:14:33 +08:00 |
|
chenwenjian
|
ec972293ce
|
Merge remote-tracking branch 'origin/feature/REQ-3010' into feature/REQ-3010
|
2024-10-08 17:30:01 +08:00 |
|
chenwenjian
|
517adacc78
|
feat(REQ-3010): SaasPositionEnum调整
cn.axzo.tyr.client.common.enums.SaasPositionEnum
|
2024-10-08 17:29:38 +08:00 |
|
lilong
|
53aa5c0ebc
|
feat:(REQ-2750-1) 修改roleService.query接口，支持超管角色合并
|
2024-10-08 15:35:12 +08:00 |
|
周敏
|
ea90dc0f86
|
feat:(REQ-3034) 支持查询被删除的 用户，临时用 step2 修复IPage的返回参数，调用方无法反序列化的问题
|
2024-09-30 15:39:35 +08:00 |
|
lilong
|
1468582e58
|
feat:(REQ-3034) 增加roleIds查询条件
|
2024-09-29 17:45:21 +08:00 |
|
lilong
|
fc0ca81207
|
feat:(REQ-2750) 还原一个项目一个超管角色的代码，因为影响点太多，单独拉分支做开发
|
2024-09-29 16:41:14 +08:00 |
|
lilong
|
68d0641f2e
|
feat:(REQ-3034) 支持返回角色code，角色类型
|
2024-09-29 13:53:48 +08:00 |
|
lilong
|
3eecfbc372
|
feat:(REQ-3034) 支持查询被删除的 用户，临时用
|
2024-09-29 13:36:39 +08:00 |
|
lilong
|
3ce3f6481a
|
feat:(REQ-3010) 注释pudge auth的pom
|
2024-09-27 16:51:52 +08:00 |
|