Commit Graph

1193 Commits

Author SHA1 Message Date
lilong
55f1de7db4 feat: (feature/REQ-2595) 临时接口增加roleName返回 2024-11-15 15:25:47 +08:00
lilong
113846ac9c feat: (feature/REQ-2595) 临时接口增加roleName返回 2024-11-15 13:57:08 +08:00
chenwenjian
8961716eba Merge branch 'master' into feature/REQ-2993 2024-11-14 18:02:59 +08:00
lilong
8d5b21cc8d feat: (feature/REQ-2595) 角色权限job去掉非超管的角色刷新,因为超管也有离场权限 2024-11-14 16:13:58 +08:00
lilong
c4d14003e0 feat: 关闭钉钉告警 2024-11-13 19:45:42 +08:00
lilong
ce167d4635 feat: (feature/REQ-2595) 菜单详情接口增加roleType返回 2024-11-13 16:46:13 +08:00
lilong
fb723337cb feat: (feature/REQ-2595) 菜单详情接口增加roleType返回 2024-11-13 16:13:44 +08:00
lilong
ab2900679f feat: (feature/REQ-2595) 角色tree接口增加roleType返回 2024-11-13 13:54:23 +08:00
lilong
09ea882d03 feat: 注释掉上报元素的接口,因为现在会出现问题,也不能使用这个 2024-11-13 09:36:44 +08:00
lilong
e0c7ac211b feat: (feature/REQ-3057) 用户角色删除和更新时增加mq 2024-11-12 13:37:05 +08:00
lilong
965f421a4d feat: (feature/REQ-3057) 用户列表增加roleTypes查询 2024-11-12 11:31:44 +08:00
lilong
758a3fafea feat: (feature/REQ-2595) 处理管理员角色更新后,缓存没更新的问题 2024-11-12 10:34:04 +08:00
lilong
6238ff81d6 feat: (feature/REQ-2595) 菜单权限查询,处理用户只有免授权权限但是没有查询到父节点的问题 2024-11-08 15:42:59 +08:00
lilong
037e466c73 feat: (feature/REQ-2595) 服务器启动时加载权限缓存,处理一个权限点一个权限集有多条记录的情况 2024-11-07 14:36:49 +08:00
lilong
a90cc28aee feat: (feature/REQ-2595) 服务器启动时加载权限缓存,处理一个权限点一个权限集有多条记录的情况 2024-11-07 09:49:07 +08:00
周敏
b37690a476 feat:(REQ-2993) 数据权限调整
1、增加 包含班组/不包含班组 的纬度
2、调整之前的数据权限选项
2024-11-06 18:28:43 +08:00
lilong
181a7becdd feat: (feature/REQ-2595) 增加用户角色分页接口 2024-11-05 13:37:36 +08:00
lilong
62313202f7 feat: (feature/REQ-2595) 修改权限查询支持tags过滤 2024-11-04 20:16:31 +08:00
lilong
0e3aa801fa feat: (feature/REQ-2595) 修改权限相关接口支持tags查询 2024-11-04 15:57:53 +08:00
lilong
8bb439593b Merge remote-tracking branch 'origin/master' into feature/REQ-2595
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
#	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-11-04 14:51:13 +08:00
lilong
62da7a00d2 feat: (feature/REQ-2595) 修改更新菜单角色时的bug 2024-11-01 14:58:43 +08:00
lilong
0eb7bcd5bb feat: (feature/REQ-2595) 修改角色权限时,增加更新操作 2024-10-31 17:33:04 +08:00
lilong
9c34e9cd89 feat: (feature/REQ-2595) 修改角色权限时,增加更新操作 2024-10-31 17:14:22 +08:00
lilong
eab3cb770c feat: (feature/REQ-2595) 修改角色修改权限 2024-10-30 21:00:01 +08:00
lilong
b69d774ff8 feat: merge 2024-10-30 15:06:19 +08:00
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
lilong
05b0590605 feat: (feature/REQ-2595) 菜单管理编辑角色权限增加角色权限标签 2024-10-29 16:06:59 +08:00
lilong
69da738ffb feat: (feature/REQ-2595) 菜单管理编辑角色权限增加角色权限标签 2024-10-29 16:01:31 +08:00
lilong
714022be90 feat: (feature/REQ-2595) 菜单组件详情增加tags,保存预设角色、菜单权限增加tags 2024-10-28 17:34:54 +08: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
lilong
8ab50f4cb9 feat: (feature/REQ-2595) 角色查询、菜单查询支持权限tags过滤 2024-10-28 10:53:13 +08:00
lilong
0d18367995 Merge branch 'hotfix/20241021' into feature/REQ-2595 2024-10-28 10:48:52 +08:00
lilong
2051e761df feat: (feature/REQ-2750) 修改同步菜单时支持同步权限标签 2024-10-25 15:18:04 +08: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
ad7224a332 feat: (feature/REQ-2595) 修改项目下有权限的人支持权限标签过滤 2024-10-25 10:40:24 +08:00
lilong
9a9ab39fcc feat: (feature/REQ-2595) 修改查询用户有权限的菜单资源支持权限标签过滤 2024-10-24 16:46:10 +08:00
lilong
65363b6e48 feat: (feature/REQ-2595) 修改鉴权接口支持普通角色、管理员角色的权限标签过滤 2024-10-24 13:56:25 +08:00
lilong
3c06ee73eb Merge remote-tracking branch 'origin/feature/REQ-2595' into feature/REQ-2595
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/event/inner/CacheRolePermissionHandler.java
#	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-24 10:02:50 +08:00
lilong
1494412969 feat: (feature/REQ-2595) 角色权限缓存增加tags, 2024-10-22 18:54:11 +08:00
lilong
f3efb695e9 feat: (hotfix/20241021) 优化菜单节点详情接口,提高接口性能 2024-10-21 15:47:34 +08:00
lilong
f10a3a91f3 feat: (feature/REQ-3010) 迁移pudge saasfeature
相关接口
2024-10-17 15:46:12 +08: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
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
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
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
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
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
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
李昆鹏
a2069f8377 feat(REQ-2899):pageV2接口调整。 2024-09-14 13:36:56 +08:00
李昆鹏
f4b99c6209 feat(REQ-2899):pageV2接口调整。 2024-09-14 13:12:12 +08:00
lilong
d333d02cee feat:(feature/REQ-2750) 增加初始化角色分组、角色的接口 2024-09-14 10:59:07 +08:00