wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,280 Commits 1 Branch 0 Tags 4.3 MiB
afa65a1ebd
Commit Graph

1280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
李龙
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
李龙
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
abc4445fec feat: (feature/REQ-3034) 修改临时接口支持已删除和未删除的同时查询 2024-10-14 09:53:22 +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
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
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
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
5210de5c3a feat:(REQ-2750) 处理岗位角色限制配置为null的情况 2024-09-26 10:49:02 +08:00
lilong
a1bedadf51 feat:(REQ-2750) 修改项目负责人更新成admin后的用户更新角色接口 2024-09-25 22:19:26 +08:00
lilong
b1c3989166 Merge branch 'feature/REQ-2935' 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageSaasFeatureResourceReq.java
 2024-09-25 18:20:02 +08:00
李龙
bc3d34aadf Merge branch 'feature/REQ-2845' into 'master' 
Feature/req 2845

See merge request universal/infrastructure/backend/tyr!217
 2024-09-25 10:14:34 +00:00
lilong
7b08981945 feat:(REQ-2750) 收口roleUserRelation删除的接口 2024-09-24 17:33:32 +08:00
lilong
91faafe72e feat:(REQ-2968) 修改接口目前只返回roleId，减少IO流量 2024-09-24 15:48:04 +08:00
lilong
dd65dce4af feat:(REQ-2968) 资源详情增加needRole 2024-09-24 14:51:28 +08:00
lilong
0e416ff5ab Merge branch 'master' into feature/REQ-2845 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
 2024-09-23 10:23:10 +08:00
lilong
0f8340ce1c feat:(REQ-2845) 修改政务端的鉴权逻辑，因为增加了政务端，使用提供的isGA来判断是否是政务端 2024-09-23 09:59:44 +08:00
李龙
aa9fc3c09f Merge branch 'hotfix-20240920' into 'master' 
feat:hotfix-20240920 修改项目下只有管理员角色导致差普通角色时加载缓存接口过慢

See merge request universal/infrastructure/backend/tyr!204
 2024-09-20 11:33:01 +00:00
lilong
e19f254737 feat:hotfix-20240920 修改项目下只有管理员角色导致差普通角色时加载缓存接口过慢 2024-09-20 19:30:53 +08:00
lilong
c4e37637da feat:merge master to REQ-2750 2024-09-20 11:32:00 +08:00
lilong
6235f4a801 Merge branch 'master' into feature/REQ-2750 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/event/inner/CacheRolePermissionHandler.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/event/inner/CacheRoleSaasFeatureResourceHandler.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/job/CacheRoleFeatureResourceJob.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/job/CacheRolePermissionJob.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RolePermissionCacheServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleSaasFeatureResourceCacheServiceImpl.java
 2024-09-20 11:23:36 +08:00
lilong
7d517a214b feat:(REQ-2750) 刷新用户超管角色时，增加可指定用户去刷超管 2024-09-20 10:06:33 +08:00
李龙
6dcc48f602 Merge branch 'hotfix/20240906' into 'master' 
Hotfix/20240906

See merge request universal/infrastructure/backend/tyr!200
 2024-09-18 11:44:57 +00:00
李龙
b62eabdef4 Merge branch 'feature/REQ-2899' into 'master' 
Feature/req 2899

See merge request universal/infrastructure/backend/tyr!199
 2024-09-18 11:39:55 +00:00
lilong
67ebcd73dc feat:(feature/REQ-2750) 增加私有接口，清洗角色权限点的数据 2024-09-18 14:12:43 +08:00
lilong
92d0a627d2 feat:(feature/REQ-2899) 解决通过页面code或者name模糊查询bug 2024-09-14 14:32:53 +08:00
李昆鹏
cc8e6c723b feat(REQ-2899):关系接口调整。 2024-09-14 14:01:52 +08:00