wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
618 Commits 1 Branch 0 Tags 4.3 MiB
018e79b65c
Commit Graph

355 Commits

Author SHA1 Message Date
陈维伟
70b86b8f4e add comment 2023-12-07 13:57:05 +08:00
陈维伟
526564e253 实现接口: 
删除用户角色关联关系接口
 2023-12-06 16:20:33 +08:00
zuoqinbo
5d8db627d0 feat: REQ-1650 账户异动参数 2023-12-05 12:05:03 +08:00
陈维伟
08619a8f5e 实现逻辑: 
查询产品列表
新增产品
更新产品
 2023-12-05 11:34:16 +08:00
zuoqinbo
02537e43d4 feat: REQ-1650 2023-12-05 10:24:32 +08:00
zuoqinbo
1a8cdc41ee Merge remote-tracking branch 'origin/feature/REQ-1650' into feature/REQ-1650 2023-12-01 15:40:35 +08:00
zuoqinbo
b6f800691f feat: REQ-1650 2023-12-01 15:40:12 +08:00
TanJ
b50725a9c1 fix : 角色查询bug 2023-12-01 15:30:28 +08:00
zuoqinbo
495e026157 feat: REQ-1650 2023-12-01 11:23:55 +08:00
TanJ
0d0a8810c0 fix(1882): 名称修改 2023-12-01 10:54:24 +08:00
陈维伟
296959f0c4 解决反序列化错误问题 
ListIdentityFromPermissionResp
 2023-11-30 20:19:55 +08:00
TanJ
b0048071e7 fix(1882): 添加权限点相关接口 2023-11-30 18:25:15 +08:00
zuoqinbo
96ff41ef79 feat: REQ-1650 2023-11-30 18:19:49 +08:00
zuoqinbo
9e56ef41d6 feat: REQ-1650 2023-11-30 18:00:31 +08:00
zuoqinbo
d252f9f230 feat: REQ-1650 2023-11-30 11:45:21 +08:00
zuoqinbo
29c75710ca feat: REQ-1650 2023-11-29 16:46:28 +08:00
zhansihu
0232279c83 feat(permission): 权限查询支持指定角色 2023-11-27 18:10:49 +08:00
zuoqinbo
9aeb17c480 feat: REQ-1650 角色ID查询人员列表 2023-11-25 15:21:43 +08:00
zuoqinbo
d9d582b117 feat:账户变更记录 2023-11-24 09:50:29 +08:00
zuoqinbo
04c50e6fbd Merge remote-tracking branch 'origin/dev' into dev 2023-11-23 19:00:10 +08:00
zuoqinbo
f04357f279 feat:账户变更记录 2023-11-23 18:59:49 +08:00
TanJ
3fb08ce52f Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-23 16:54:22 +08:00
TanJ
7f5bc29ce1 fix(1609): 接口命名BUG 2023-11-23 16:53:00 +08:00
zhansihu
1cdbf9acaf Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
 2023-11-21 17:13:06 +08:00
zhansihu
e1177f20e8 feat(flow): 增加支持多ou和workspace 2023-11-21 17:11:02 +08:00
TanJ
5e02894336 Merge branch 'feature/REQ-1609' into dev 2023-11-16 17:09:34 +08:00
TanJ
0c69e67c09 feat(1609): 工作台查询角色 2023-11-16 17:09:04 +08:00
zhansihu
ebd693a781 feat(base-dict): 字典参数描述 2023-11-15 17:22:05 +08:00
zhansihu
775f19b682 Merge remote-tracking branch 'origin/feature/REQ-1609' into dev 2023-11-15 14:02:46 +08:00
zhansihu
eb0fa082eb feat(base-dict): 增加字典类型 2023-11-15 14:01:23 +08:00
zhansihu
4dfb9efbf8 feat(role-user): 增加角色用户分页接口 2023-11-14 17:06:59 +08:00
zhansihu
1227e0a94f refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 11:52:43 +08:00
zhansihu
3872f8cd00 refactor(permission-check): 优化日志+1 2023-11-03 10:09:30 +08:00
zhansihu
96d616afd0 refactor(permission-check): 优化日志；产品权限过滤 2023-11-03 09:38:34 +08:00
金海洋
010d16c495 listByRoleIds 增加workspace id 2023-10-26 18:06:32 +08:00
zhansihu
761ae92ca3 refactor(permission2identity): 增加返回personalId 2023-10-25 11:00:49 +08:00
zhansihu
9782249c3e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-24 10:48:45 +08:00
zhansihu
46e34e0876 feature(permission-query): 修复请求转换 2023-10-24 10:48:39 +08:00
陈维伟
9c0bb80894 根据身份查询角色信息补充字段:是否包含权限集权限点信息,解决OMS、CMS逻辑矛盾问题 2023-10-23 19:12:38 +08:00
wangjibo
2006cd3b18 添加批量接口 2023-10-21 15:57:58 +08:00
wangjibo
ab93553a30 删除单位参与的工作台的所有的人员与角色。 目前主要是用于移除参与单位的地方 2023-10-21 15:54:12 +08:00
wangjibo
e2f692f830 删除超管角色 2023-10-21 15:35:08 +08:00
wangjibo
bea6d121e1 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 15:02:42 +08:00
wangjibo
63ec1595f3 用户角色接口调整 2023-10-21 15:02:37 +08:00
金海洋
2eb5b95c30 修改 SuperAminInfoResp 2023-10-21 14:59:28 +08:00
金海洋
5080d67322 增加 batchSuperAdminList api 2023-10-21 14:27:40 +08:00
wangjibo
f26036f652 角色接口调整，删除重复api接口 2023-10-21 14:23:53 +08:00
zhansihu
2a3132b665 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 14:10:11 +08:00
zhansihu
7bee500ca2 feat(code2identity): 实现权限查人接口 2023-10-21 14:09:57 +08:00
金海洋
c0165d17a2 增加 batchSuperAdminList api 2023-10-21 12:54:03 +08:00
金海洋
4543eec11e 修改BaseWorkspaceAndOuModel 2023-10-21 10:55:34 +08:00
金海洋
0f1a9c98f6 修改BaseWorkspaceAndOuModel 2023-10-21 10:54:56 +08:00
金海洋
d2f2d46f4b 修改BaseWorkspaceAndOuModel 2023-10-21 10:48:36 +08:00
张弘昊
f7380df0ec 请求参数加上builder 2023-10-20 17:54:20 +08:00
金海洋
34481efaa5 feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:57 +08:00
陈维伟
7d0e7d68fd 查询角色信息通用接口默认不返回角色下的权限集信息,提高接口处理速度 2023-10-20 14:08:17 +08:00
zhansihu
1e03e4c0df refactor(role-query): 用户增加返回ouid 2023-10-20 10:50:01 +08:00
yangsong
c437ace6d7 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
 2023-10-20 09:50:05 +08:00
yangsong
7b0be4dfd2 创建机构管理员账户角色 2023-10-20 09:48:33 +08:00
金海洋
542443fd25 feat(server): 修改用户角色列表接口 2023-10-19 18:02:40 +08:00
张弘昊
2defb39906 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 17:25:18 +08:00
张弘昊
a009656d5f 通过名称获取角色 2023-10-19 17:25:12 +08:00
zhansihu
707e748a64 refactor(role-query): 改变角色查询逻辑 2023-10-19 16:26:39 +08:00
zhansihu
24f30d7fd2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 15:38:20 +08:00
zhansihu
70044ff732 refactor(role-query): 增加参建单位资质条件 2023-10-19 15:38:09 +08:00
yangsong
b24927820a 创建机构用户权限 2023-10-19 13:54:38 +08:00
wangli
a00c9ff26d add - 新增通过工作台 id 查询权限点 2023-10-19 11:40:59 +08:00
wangli
80591cd3ee add - 新增通过工作台 id 查询权限点 2023-10-19 11:29:22 +08:00
zhansihu
8cff1d1338 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 10:16:12 +08:00
zhansihu
7009b40444 feature(permission-query): 权限检查接口 2023-10-19 10:16:06 +08:00
张弘昊
f8bc855e50 Merge remote-tracking branch 'origin/feature/REQ-1502-zhh' into feature/REQ-1502 2023-10-19 10:01:13 +08:00
张弘昊
33d1b8fddd 获取权限码 2023-10-19 09:51:10 +08:00
yangsong
df12ccdd8e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
 2023-10-18 17:02:57 +08:00
yangsong
adbdf51b80 删除用户角色 2023-10-18 17:01:21 +08:00
zhansihu
eb7d2e3005 refactor(role-query): test调整 2023-10-18 16:38:29 +08:00
zhansihu
a05bd02bf3 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:27:18 +08:00
zhansihu
ea4883c6b5 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:24:56 +08:00
张弘昊
f757421375 通过名字获取角色信息 2023-10-18 16:24:56 +08:00
zhansihu
d14cb28066 feature(role-query): 角色分页查询接口 2023-10-18 16:22:53 +08:00
wangli
10cdd20b93 add - 新增通过工作台 id 查询权限点 2023-10-18 16:20:04 +08:00
张弘昊
2d366e4500 创建超级管理员角色 2023-10-18 15:45:36 +08:00
张弘昊
a05b3b57a5 创建超级管理员角色 2023-10-18 14:49:41 +08:00
张弘昊
0d5453efdf Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-18 14:47:56 +08:00
张弘昊
692a0a0e66 创建超级管理员角色 2023-10-18 14:47:00 +08:00
TanJ
cd4751ebce feat: terminal 
terminal查询逻辑调整
 2023-10-18 10:56:58 +08:00
金海洋
0161d655c0 feat(server): 删除 deleteUserRolesOfWorkspace 接口 2023-10-18 09:46:47 +08:00
yangsong
a1b584c1ef url添加前缀 2023-10-17 19:23:18 +08:00
yangsong
6999302f6f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-17 19:20:59 +08:00
yangsong
38b200e600 接口迁移，删除管理员角色参数调整 2023-10-17 19:17:18 +08:00
金海洋
cb6aa953e1 feat(server): 增加删除工作台下的所有人员与平台角色接口 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:
1. 增加删除工作台下的所有人员与平台角色接口
 2023-10-17 18:55:27 +08:00
yangsong
31958870c9 接口迁移，接口定义 2023-10-17 16:59:20 +08:00
zhansihu
1569262201 feature(saas-auth): 定义新的权限查人接口 2023-10-17 16:48:23 +08:00
TanJ
036809191c feat: WorkspaceJoinType 
使用int入参
 2023-10-17 14:32:37 +08:00
金海洋
25d6fb13a9 feat(server): 增加移除某个人在某个工作台的所有角色(除超管) 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:1. 增加 /api/saas-role-user/delete-user-role 接口
 2023-10-17 13:39:17 +08:00
TanJ
f27039610d feat: WorkspaceJoinType add match value 2023-10-17 11:10:13 +08:00
TanJ
aae3396474 feat: 优化 2023-10-16 21:04:07 +08:00
yangsong
4928a158df bugfix，通过roleid过滤 2023-10-16 18:51:12 +08:00
TanJ
d9b5412e5d feat: 权限返回参数精简 2023-10-16 18:09:58 +08:00
TanJ
ef33e01d85 Merge branch 'master' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
 2023-10-16 16:28:05 +08:00
陈维伟
75b01ce7db Merge branch 'master' into feature/REQ-1309 2023-10-16 16:02:44 +08:00