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
|
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 |
|
李昆鹏
|
fd86f41f38
|
feat(REQ-2699):菜单资源增加多工作台类型支持
|
2024-08-06 14:08:28 +08:00 |
|
yanglin
|
615e2e21e0
|
REQ-2821: 添加一些日志
|
2024-08-05 20:04:46 +08:00 |
|
yanglin
|
5b028831a5
|
REQ-2821: 添加一些日志
|
2024-08-05 18:25:25 +08:00 |
|