Commit Graph

1181 Commits

Author SHA1 Message Date
chenwenjian
957070b9fc Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:37:20 +08:00
陈维伟
5e3851dfac Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:36:37 +08:00
陈维伟
a0d55bd61a fix bug:角色查询逻辑拼接ouTypeCode查询逻辑问题 2023-09-11 18:36:32 +08:00
zhansihu
7c1a1f3959 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 18:28:24 +08:00
zhansihu
23c223dda9 fix(权限点): 忽略不需要的属性 2023-09-11 18:28:19 +08:00
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
陈维伟
d229937ac0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 17:52:52 +08:00
陈维伟
25b309a1a6 验证角色数据清洗 2023-09-11 17:52:47 +08:00
zhansihu
d4099a66dd fix(权限点):数据过滤对象 2023-09-11 17:33:37 +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
陈维伟
3766422f3b Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-11 16:36:17 +08:00
陈维伟
4633c44cc6 补充删除权限集逻辑 2023-09-11 16:36:10 +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
陈维伟
8409db6023 添加角色清洗逻辑 2023-09-11 16:12:37 +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
8bd09278bf update - 字典list 接口增加通过 ID 获取 2023-09-11 15:24:07 +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
f2ebf603bc update - 调整产品删除实现逻辑 2023-09-11 14:06:14 +08:00
陈维伟
475ff9fda0 配置启动类 2023-09-11 13:46:23 +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
775a68ee7d update - 调整产品删除实现逻辑 2023-09-11 11:00:03 +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
陈维伟
a31d8218fe 根据身份查询角色接口补充workspaceId ouId 2023-09-11 10:29:32 +08:00
chenweiwei
a79b7419d3 clear log 2023-09-10 15:27:29 +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
chenwenjian
985c4e4d66 获取字典节点接口 2023-09-08 19:10:59 +08:00
陈维伟
52f71613d3 add comment 2023-09-08 19:03:10 +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
47e887c392 接口调整 2023-09-08 18:35:54 +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
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
8f80147d18 字典接口定义 2023-09-08 16:02:30 +08:00
chenwenjian
5194d7fbbf 字典接口定义 2023-09-08 16:01:36 +08:00
zhansihu
ad02d292c2 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1204 2023-09-08 13:50:24 +08:00
zhansihu
d981789b3d refactor(权限点):实现保存 删除 变更接口 2023-09-08 13:48:09 +08:00
chenwenjian
2df098dd53 删除无用包 2023-09-08 11:49:23 +08:00
陈维伟
67932a1a05 添加枚举和人员角色关联实体 2023-09-08 11:46:51 +08:00
zhansihu
ac0f6f116e Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-08 10:02:20 +08:00
zhansihu
794e0dc515 feature(权限点):增加保存 删除 变更接口 2023-09-08 10:02:01 +08:00
e099e97f3f add - 添加产品相关接口的实现 2023-09-07 19:07:20 +08:00
5473f434d6 add - 添加产品相关接口的实现 2023-09-07 18:45:59 +08:00
zhansihu
182c815d9d feature(权限点):实现详情查询;实现ID批量查询 2023-09-07 17:13:09 +08:00
陈维伟
4241d1b7da Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-07 16:29:28 +08:00
陈维伟
c3809b7c7b 接口定义补充缺失字段 2023-09-07 16:29:22 +08:00
zhansihu
3596208d64 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-07 16:02:07 +08:00
zhansihu
a3506509c3 refactor(权限点):详情字段扩充;实现树形查询接口 2023-09-07 16:02:00 +08:00
b661403644 add - 添加产品相关 ORM 层 2023-09-07 14:04:15 +08:00
zhansihu
d1c89b7e4d refactor(权限点):DTO调整;增加接口 2023-09-06 20:06:43 +08:00
zhansihu
8ef9910371 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1204 2023-09-06 16:29:27 +08:00
zhansihu
cb88f99a24 feature(权限点):增加权限点API接口;
refactor(init): 补充依赖,删除示例代码
2023-09-06 16:29:17 +08:00
陈维伟
b8b51e1483 添加角色/分组/权限组相关基础代码 2023-09-06 15:54:46 +08:00
zhansihu
cfc3aa9e4e fix(权限点):删除重复字段 2023-09-06 11:39:04 +08:00
zhansihu
5db09f1883 feature(权限点):新增CRUD 2023-09-06 11:36:43 +08:00
tianliyong
95c18c05b0 初始化调整 2023-08-03 16:16:11 +08:00
tianliyong
bc1a716d2d 代码初始化 2023-08-03 16:14:59 +08:00