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

729 Commits

Author SHA1 Message Date
lilong
ab2900679f feat: (feature/REQ-2595) 角色tree接口增加roleType返回 2024-11-13 13:54:23 +08:00
lilong
965f421a4d feat: (feature/REQ-3057) 用户列表增加roleTypes查询 2024-11-12 11:31:44 +08:00
周敏
78fae7fb16 feat:(REQ-2993) 数据权限调整 step2 调整enumerate的枚举值 
1、增加 包含班组/不包含班组 的纬度
2、调整之前的数据权限选项
 2024-11-06 19:58:47 +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
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
eab3cb770c feat: (feature/REQ-2595) 修改角色修改权限 2024-10-30 21:00:01 +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
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
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
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
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
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
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
d766af05aa feat:(REQ-3068) 新增批量判断是否有应用权限的接口 2024-10-11 14:44:43 +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
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
chenwenjian
517adacc78 feat(REQ-3010): SaasPositionEnum调整 
cn.axzo.tyr.client.common.enums.SaasPositionEnum
 2024-10-08 17:29:38 +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
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
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
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
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
李龙
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
92d0a627d2 feat:(feature/REQ-2899) 解决通过页面code或者name模糊查询bug 2024-09-14 14:32:53 +08:00
lilong
d333d02cee feat:(feature/REQ-2750) 增加初始化角色分组、角色的接口 2024-09-14 10:59:07 +08:00
lilong
40773db347 feat:(feature/REQ-2750) 角色树增加角色的所属单位，项目 2024-09-12 16:29:03 +08:00
lilong
10045a5588 feat:(hotfix/20240906) 只缓存普通角色以及缓存有效期改成1天 2024-09-11 15:26:05 +08:00
lilong
dbf46f8d5b feat:(feature/REQ-2750) 用户角色增加roleCode返回 2024-09-10 19:19:07 +08:00
lilong
d3f8d53427 feat:(feature/REQ-2750) 恢复用户角色列表返回对象 2024-09-10 19:02:22 +08:00
lilong
f5954c2d3b feat:(feature/REQ-2935) 修改入参类型 2024-09-10 17:40:37 +08:00
lilong
4d26aa22b3 feat:(feature/REQ-2750) 增加统一的菜单查询接口 2024-09-10 15:55:54 +08:00
lilong
73a1651f1d feat:(feature/REQ-2750) 修改角色、角色分组tree接口 2024-09-10 10:59:50 +08:00
lilong
08be779df6 feat:(feature/REQ-2750) 角色列表查询增加角色分组查询条件 2024-09-09 17:26:42 +08:00
lilong
360fd31bec feat:(REQ-2750) 去掉saasRoleUserRelation的重复查询代码，切换到新的统一查询接口 2024-09-05 17:55:09 +08:00
lilong
4082c9d8ce feat:(REQ-2750) 去掉saasRoleUserRelation的重复查询代码，切换到新的统一查询接口 2024-09-05 15:37:24 +08:00
李昆鹏
79ce4f4252 feat(REQ-2899):cms上报增加资源appType 2024-09-05 14:25:52 +08:00
李昆鹏
f6be31db67 Merge remote-tracking branch 'origin/master' into feature/REQ-2899 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
 2024-09-05 09:51:35 +08:00
luofu
066537a210 feat(REQ-2488): 合并master的代码 2024-09-02 14:05:55 +08:00
lilong
3ffbe79cd4 Merge remote-tracking branch 'origin/master' 2024-09-02 14:00:30 +08:00
lilong
03987d9028 Merge branch 'feature/REQ-2699' 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductFeatureRelationServiceImpl.java
 2024-09-02 13:54:43 +08:00
李昆鹏
3efcffff75 feat(REQ-2899):新增导入接口，暂没实现。。 2024-09-02 12:47:06 +08:00
李昆鹏
293897e697 feat(REQ-2899):新增导入接口，暂没实现。。 2024-08-30 20:24:48 +08:00
李昆鹏
07b8226692 feat(REQ-2899):新增导入接口，暂没实现。。 2024-08-29 16:57:35 +08:00
李昆鹏
d643dae9c4 feat(REQ-2899):菜单资源支持修改父级 2024-08-27 16:59:56 +08:00
李昆鹏
bfa8a18432 feat(REQ-2899):前端资源删除接口 2024-08-27 14:47:21 +08:00
lilong
a2dede09af feat:(REQ-2699) 修改角色权限时，增加roleId，方便快速准确更新角色权限 2024-08-27 11:17:04 +08:00
李昆鹏
59f0748d2c feat(REQ-2899):前端资源删除接口 2024-08-26 19:34:45 +08:00
李昆鹏
4c95776eb0 feat(REQ-2899):前端资源删除接口 2024-08-26 16:07:47 +08:00
lilong
40d076efb1 feat:(REQ-2488) 角色用户列表接口支持返回roleCode 2024-08-23 13:58:46 +08:00
lilong
f1e6a59d2a feat:(REQ-2488) 角色用户列表接口支持roleId和roleCodes查询 2024-08-23 11:07:29 +08:00
李昆鹏
50e2543702 feat(REQ-2899):前端资源删除接口 2024-08-23 10:36:29 +08:00
李昆鹏
cc28bb554a feat(REQ-2899):前端资源新增、编辑接口调整 2024-08-23 08:50:33 +08:00
李昆鹏
7113284251 feat(REQ-2899):前端资源管理 2024-08-22 16:14:15 +08:00
lilong
a39d00e980 feat:(REQ-2699) 菜单权限增加支持查询显示的菜单条件 2024-08-21 20:55:04 +08:00
周敏
85bfb2ab1b Merge branch 'feature/REQ-2864' into 'master' 
feat(REQ-2864): 添加单位、部门、协同关系、部门人员操作日志相关的枚举，扩展接口支持operatorId为空的情况

See merge request universal/infrastructure/backend/tyr!125
 2024-08-14 09:21:23 +00:00
lilong
08a1e556fe feat:(REQ-2699) 菜单权限树tree接口增加是否排除默认权限的入参，因为不是所有需求都需要 2024-08-14 16:53:34 +08:00
周敏
e7fb5dd8d8 feat(REQ-2864): 添加单位、部门、协同关系、部门人员操作日志相关的枚举，扩展接口支持operatorId为空的情况 2024-08-13 18:14:44 +08:00
lilong
494bebc84d feat:(REQ-2699) 菜单权限增加页面元素查询功能 2024-08-12 19:52:49 +08:00
lilong
a85354c677 feat:(REQ-2699) 菜单权限支持版本号和父组件code查询 2024-08-12 17:56:22 +08:00
李昆鹏
4f48057a59 Merge remote-tracking branch 'origin/master' into feature/REQ-2300 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RowPermissionEnum.java
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/data/object/AttributePermissionBO.java
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/data/object/DataObjectRuleBO.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
 2024-08-12 17:45:04 +08:00
lilong
35b2016662 feat:(REQ-2699) 支持查询菜单权限列表 2024-08-10 11:21:16 +08:00
lilong
2b3d7e5219 feat:(REQ-2699) 支持查询页面元素时查询菜单信息 2024-08-10 09:52:14 +08:00
李龙
b3341bfa38 Merge branch 'hotfix/20240807' into 'master' 
Hotfix/20240807

See merge request universal/infrastructure/backend/tyr!116
 2024-08-09 10:22:44 +00:00
李昆鹏
604839f711 feat(REQ-2699): 元素page接口返回linkExt 2024-08-09 16:26:07 +08:00
lilong
202d0797dc feat:(REQ-2699) 修改产品权限缓存，增加版本，类型等 2024-08-09 10:43:38 +08:00
lilong
9e0e09f805 Merge branch 'feature/REQ-2720' into feature/REQ-2699 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
 2024-08-08 15:49:17 +08:00
lilong
34da59b839 feat:(HOTFIX-20240807) 兼容以前逻辑，支持由用户传入categoryType 2024-08-08 11:50:59 +08:00
李昆鹏
14d9d5a4ce fix(20240807):查询角色权限点接口增加返回角色编码 2024-08-07 10:01:34 +08:00
yanglin
8016c8e5b6 REQ-2821: 添加一些日志 2024-08-06 15:16:45 +08:00