wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557 Commits 1 Branch 0 Tags 4.3 MiB
308c3f5f3d
Commit Graph

450 Commits

Author SHA1 Message Date
zhansihu
666b9344b7 refactor(listIdentity): 线程池命名 2023-11-13 17:08:11 +08:00
zhansihu
39a89c9f22 refactor(listIdentity): 线程池命名 2023-11-13 16:29:24 +08:00
zhansihu
a354d44b39 refactor(listIdentity): 调整计时；trace跨线程 2023-11-13 16:13:58 +08:00
zhansihu
54b2ecf030 refactor(listIdentity): 时间分段 2023-11-13 14:07:57 +08:00
zhansihu
fbc10c2323 refactor(listIdentity): 时间分段 2023-11-13 14:07:00 +08:00
zhansihu
390ae73f50 refactor(listIdentity): 增加stopwatch；调整线程池 2023-11-13 13:49:19 +08:00
zhansihu
66327320a9 refactor(listIdentity): 增加stopwatch；调整线程池 2023-11-13 11:06:27 +08:00
金海洋
5918b1b308 修复错误的权限码也能查到人 2023-11-10 10:58:34 +08:00
zhansihu
ea3cf99883 fix(listIdentity): 角色权限增加过滤 2023-11-08 13:38:23 +08:00
zhansihu
c900dce339 fix(listIdentity): 补充查询条件 2023-11-07 17:35:37 +08:00
zhansihu
aa2a098e78 refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 12:04:18 +08:00
zhansihu
1227e0a94f refactor(permission-tree): 增加支持是否过滤子节点 2023-11-03 11:52:43 +08:00
zhansihu
f240176451 refactor(permission-check): 优化日志 2023-11-03 09:42:22 +08:00
zhansihu
96d616afd0 refactor(permission-check): 优化日志；产品权限过滤 2023-11-03 09:38:34 +08:00
wangjibo
7dcf7a670c Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-30 16:16:56 +08:00
wangjibo
aaf42d7694 修改角色问题修复 
1.只有超管的情况下，会导致将超管角色替换
 2023-10-30 16:16:51 +08:00
陈维伟
74545ff496 CMS角色清洗job-将回溯不了的角色洗成其他 2023-10-27 19:29:18 +08:00
金海洋
65478bfd36 add log 2023-10-26 18:19:26 +08:00
zhansihu
0b0b33169a Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-26 18:10:47 +08:00
zhansihu
13dc89cff8 debug(permission-check): log 2023-10-26 18:10:40 +08:00
金海洋
010d16c495 listByRoleIds 增加workspace id 2023-10-26 18:06:32 +08:00
金海洋
4b27dcf42b listByRoleIds 增加workspace id 2023-10-26 16:42:11 +08:00
zhansihu
bde1848a0f fix(permission-check): path匹配方式 2023-10-26 16:34:15 +08:00
zhansihu
2bbf879f22 fix(permission-check): stream collect 2023-10-26 16:34:10 +08:00
金海洋
71a32c4e74 增加日志 2023-10-26 16:30:05 +08:00
金海洋
3647cc89b0 fix getUsersFromRole newArrayList 2023-10-26 16:30:05 +08:00
zhansihu
636f706bf9 refactor(permission-check): 兼容检查权限为菜单或页面 2023-10-26 15:22:10 +08:00
zhansihu
9136037865 fix(permission-point): 兼容前端返回空列表 2023-10-25 17:51:18 +08:00
zhansihu
761ae92ca3 refactor(permission2identity): 增加返回personalId 2023-10-25 11:00:49 +08:00
金海洋
01735461a2 fix getUsersFromRole newArrayList 2023-10-24 19:28:25 +08:00
金海洋
ad2083d493 fix superAdminList 2023-10-24 17:42:34 +08:00
金海洋
7ddfff8194 修改queryBatchByIdentityIdType 2023-10-24 11:23:57 +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
陈维伟
a020b66d8c 调整清洗数据删除老角色逻辑 2023-10-23 20:20:39 +08:00
陈维伟
9c0bb80894 根据身份查询角色信息补充字段:是否包含权限集权限点信息,解决OMS、CMS逻辑矛盾问题 2023-10-23 19:12:38 +08:00
TanJ
10f95a642e feat: 设置默认查权限， 2023-10-23 18:51:22 +08:00
zhansihu
4f7d992a25 feat(product-feature-refresh): 增加任务启动注解 2023-10-23 14:12:08 +08:00
zhansihu
3cd819c85d feat(product-feature-refresh): 产品权限数据清洗任务 2023-10-23 11:46:49 +08:00
zhansihu
ac73698f5f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-21 17:54:26 +08:00
zhansihu
c122e565d7 refactor(code2identity): 产品权限增加过滤参建类型 2023-10-21 17:54:20 +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
zhansihu
ce880c2686 fix(code2identity): 处理合并冲突 2023-10-21 15:32:24 +08:00
zhansihu
a47ff15c4a Merge branch 'feature/REQ-1502' of axzsource.com:universal/infrastructure/backend/tyr into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-21 15:19:32 +08:00
zhansihu
e8fa4686b6 feat(code2identity): 实现批量查询；代码结构调整 2023-10-21 15:15:02 +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
陈维伟
ee9e6af1db CMS数据清洗优先处理角色、角色分组、用户角色关联关系,避免出现其他角色没有权限点直接跳过的情况 2023-10-21 14:07:52 +08:00
金海洋
c0165d17a2 增加 batchSuperAdminList api 2023-10-21 12:54:03 +08:00
张弘昊
f7380df0ec 请求参数加上builder 2023-10-20 17:54:20 +08:00
陈维伟
9b18ac15c8 根据id查询角色详情默认返回权限信息 2023-10-20 16:26:41 +08:00
金海洋
e3d92f404f feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:59 +08:00
金海洋
34481efaa5 feat(server): 修改查询企业工作台超级管理员 2023-10-20 15:41:57 +08:00
陈维伟
ad6fa56c25 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-20 14:08:23 +08:00
陈维伟
7d0e7d68fd 查询角色信息通用接口默认不返回角色下的权限集信息,提高接口处理速度 2023-10-20 14:08:17 +08:00
yangsong
79ed1856b1 超管角色列表性能优化 2023-10-20 14:00:59 +08:00
yangsong
886a1a10a0 获取管理员列表 2023-10-20 11:37:31 +08:00
zhansihu
1e03e4c0df refactor(role-query): 用户增加返回ouid 2023-10-20 10:50:01 +08:00
zhansihu
611490ec33 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-20 10:18:53 +08:00
zhansihu
5f702191dd refactor(role-query): relation查询过滤ou和workspace 2023-10-20 10:18:47 +08:00
yangsong
1a351cee20 报错修改 2023-10-20 09:51:12 +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
陈维伟
2bc8895177 修改dev环境企业权限模板id 2023-10-19 19:53:29 +08:00
金海洋
8309192a31 feat(server): modify queryByIdentityIdType 2023-10-19 19:26:23 +08:00
陈维伟
68832ac6ad 屏蔽测试方法 2023-10-19 19:09:29 +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
陈维伟
f5ea598344 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 16:59:00 +08:00
陈维伟
89103ca983 dev环境CMS角色清洗一轮执行完毕 2023-10-19 16:58:54 +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
陈维伟
2d254e93d2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 11:42:56 +08:00
陈维伟
722c2488b3 补充清除历史日志逻辑 2023-10-19 11:41:35 +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
陈维伟
4a7f72dd09 添加备注 2023-10-18 21:14:50 +08:00
陈维伟
d26d4e7064 更新查询企业通用角色逻辑 2023-10-18 20:31:42 +08:00
陈维伟
acf37b5560 CMS数据清洗job基础逻辑 2023-10-18 19:01:59 +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