Commit Graph

77 Commits

Author SHA1 Message Date
chenwenjian
e739e0f151 Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-11 18:22:44 +08:00
chenwenjian
3569c1b9db 更改状态接口 2023-09-11 18:21:31 +08:00
yangsong
f4e4c0fdcf 获取角色详情,分组角色id过滤 2023-09-11 18:17:52 +08:00
zhansihu
930191d84a Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 17:26:41 +08:00
zhansihu
8faa8f2cb0 refactor(权限点):增加支持workspace查询;构建顶层 2023-09-11 17:26:35 +08:00
chenwenjian
9326537e4b Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java
2023-09-11 16:27:56 +08:00
chenwenjian
742243b758 BasicDictQueryReq入参code变为codes 2023-09-11 16:23:01 +08:00
d4d18740e0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 15:33:09 +08:00
c94de2c57b update - 字典list 接口增加通过 ID 获取 2023-09-11 15:33:02 +08:00
zhansihu
6f6ca32d25 fix(权限点):更新调用地址 2023-09-11 15:32:52 +08:00
zhansihu
a2f2471193 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 15:24:32 +08:00
zhansihu
60b7f72655 refactor(权限点):保存接口增加返回当前信息 2023-09-11 15:24:26 +08:00
aae9578fac update - 字典list 接口增加通过 ID 获取 2023-09-11 15:06:29 +08:00
e380d0c942 add - 新增批量获取字典接口 2023-09-11 15:03:16 +08:00
chenwenjian
b2252789ec Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-11 14:40:34 +08:00
chenwenjian
ab091ebb63 获取字典树 2023-09-11 14:38:27 +08:00
yangsong
66c173ccbc feign url 修改 2023-09-11 14:00:36 +08:00
陈维伟
e25cc8f8a4 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
2023-09-11 11:33:43 +08:00
陈维伟
81ab60e44f 补充根据身份id类型批量查询接口 2023-09-11 11:31:22 +08:00
yangsong
a075351fa9 Merge branch 'feature/REQ-1102' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-1102 2023-09-11 11:10:20 +08:00
yangsong
77bf00fadb 角色分组spi service 2023-09-11 11:10:13 +08:00
陈维伟
34bc1fc106 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 10:55:34 +08:00
陈维伟
b6c5562760 添加Dockerfile 2023-09-11 10:55:29 +08:00
chenwenjian
15b43ee0a8 Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
2023-09-11 10:52:55 +08:00
chenwenjian
1987468897 获取字典节点列表接口 2023-09-11 10:49:41 +08:00
yangsong
5c49333198 角色分组参数变更 2023-09-11 10:32:55 +08:00
陈维伟
a31d8218fe 根据身份查询角色接口补充workspaceId ouId 2023-09-11 10:29:32 +08:00
chenweiwei
3054198020 调整api list返回结构 2023-09-10 15:23:47 +08:00
chenweiwei
b2a18a7776 实现接口:角色通用查询接口 2023-09-10 15:06:22 +08:00
chenweiwei
c670da3c8a 补充权限点字段 2023-09-10 12:21:13 +08:00
chenweiwei
a25a245b9b 实现接口:根据身份id和身份类型查询角色、权限集、权限 2023-09-09 23:02:46 +08:00
yangsong
c3df852c7f 角色查询参数修改 2023-09-08 19:03:37 +08:00
2eb2573fa4 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java
2023-09-08 18:44:55 +08:00
c200db3c4b update - 调整工程引入的 jar, 同时修改 bootstrap.yml 默认内容, 完成相关功能开发 2023-09-08 18:44:20 +08:00
chenwenjian
6b86f3afff Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-08 18:42:14 +08:00
chenwenjian
ea29183145 接口调整 2023-09-08 18:39:51 +08:00
chenwenjian
ca3ff9212d Merge branch 'feature/REQ-1212' into feature/REQ-1102 2023-09-08 18:25:56 +08:00
chenwenjian
169662e0b0 结构调整 2023-09-08 18:24:50 +08:00
陈维伟
5284c72ab1 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-08 18:23:16 +08:00
陈维伟
46282ebbe9 实现RoleApi 2023-09-08 18:23:10 +08:00
chenwenjian
e09c9045eb 字典接口调整 2023-09-08 18:21:01 +08:00
zhansihu
1c66c0b371 refactor(权限点):补提交文件 2023-09-08 16:35:23 +08:00
zhansihu
33674308d9 Merge branch 'feature/REQ-1204' into feature/REQ-1102 2023-09-08 16:29:38 +08:00
zhansihu
750bbce2be refactor(权限点):详情返回对象变更;追加信息 2023-09-08 16:29:13 +08:00
陈维伟
2281bc3552 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-08 16:06:15 +08:00
陈维伟
35683b2f99 ouTypeId -> ouTypeCode
workspaceTypeId -> workspaceTypeCode
2023-09-08 16:06:10 +08:00
chenwenjian
6a6416d073 Merge branch 'feature/REQ-1212' into feature/REQ-1102
# Conflicts:
#	tyr-server/pom.xml
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/app/package-info.java
2023-09-08 16:05:38 +08:00
chenwenjian
5194d7fbbf 字典接口定义 2023-09-08 16:01:36 +08:00
8188cb5886 update - 调整 POJO 的注解,支持链式设值 2023-09-08 13:43:11 +08:00
chenwenjian
2df098dd53 删除无用包 2023-09-08 11:49:23 +08:00