wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
453 Commits 1 Branch 0 Tags 4.3 MiB
65478bfd36
Commit Graph

381 Commits

Author SHA1 Message Date
TanJ
29c059242e feat: add log 2023-10-17 10:37:20 +08:00
TanJ
aae3396474 feat: 优化 2023-10-16 21:04:07 +08:00
TanJ
4a4a6019e9 feat: 优化 2023-10-16 19:49:15 +08:00
yangsong
4928a158df bugfix，通过roleid过滤 2023-10-16 18:51:12 +08:00
TanJ
d9b5412e5d feat: 权限返回参数精简 2023-10-16 18:09:58 +08:00
TanJ
8ac09649b3 feat: 查询权限逻辑调整 2023-10-16 18:00:36 +08:00
TanJ
ef33e01d85 Merge branch 'master' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
 2023-10-16 16:28:05 +08:00
TanJ
949eef53ad feat: 注入方式调整 2023-10-16 16:08:40 +08:00
陈维伟
75b01ce7db Merge branch 'master' into feature/REQ-1309 2023-10-16 16:02:44 +08:00
TanJ
2cbf811f74 feat: remove FeignConfig.java 2023-10-16 15:21:45 +08:00
TanJ
b239181f77 feat: add log 2023-10-16 15:05:34 +08:00
TanJ
ef948f079b feat(import): 去除无效依赖 2023-10-16 10:39:56 +08:00
TanJ
31817f6934 feat(config): thread pool config 
参数调整
 2023-10-16 10:21:51 +08:00
TanJ
cd70e660a8 feat(通用接口): 添加权限通用接口 
通过人查权限
 2023-10-14 18:50:32 +08:00
金海洋
9db084c5e7 Merge branch 'feature/REQ-1141' 2023-10-14 10:06:29 +08:00
TanJ
7829278295 Merge branch 'feature/REQ-1141' into feature/REQ-1502 2023-10-13 11:47:45 +08:00
zhansihu
006e8ea668 fix(saas-auth): 数据兼容处理NPE 2023-10-11 16:25:31 +08:00
yangsong
ed08224324 dataType添加枚举常量 2023-10-11 10:13:30 +08:00
yangsong
b2a10e71ca 验证代码优化 2023-10-10 18:53:26 +08:00
yangsong
14fe3d24d2 验证代码优化 2023-10-10 16:35:12 +08:00
yangsong
0c2861eb24 去掉featureCode重复验证，修改featureCode生成规则 2023-10-10 16:18:12 +08:00
yangsong
9c7d91aced 名称重复验证bugfix 2023-10-10 10:52:24 +08:00
yangsong
447d318454 节点验证 2023-10-09 19:07:06 +08:00
yangsong
d44256638a Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
 2023-10-09 18:59:05 +08:00
yangsong
ecb789884b 节点验证 2023-10-09 18:57:04 +08:00
zhansihu
fad9ad47db fix(permissionPoint): 使用单位类型扩展支持 2023-10-09 18:17:48 +08:00
chenwenjian
034622e26f Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-10-09 17:44:42 +08:00
chenwenjian
7b8266cf29 feat: 更新权限点申请详情字段映射调整 2023-10-09 17:44:29 +08:00
yangsong
5d16341730 bugfix 2023-10-09 17:25:21 +08:00
yangsong
dbd798f89e bugfix 2023-10-09 17:15:40 +08:00
zhansihu
92e00f0979 fix(saas-auth):补提交文件 2023-10-09 15:36:18 +08:00
zhansihu
c41f77678f refactor(细节调整；查询逻辑实现): 2023-10-09 15:07:53 +08:00
yangsong
15cd7bc67b 流程结束删除权限点 2023-10-09 15:02:46 +08:00
yangsong
8eb3168177 过滤无效节点 2023-10-09 11:52:17 +08:00
yangsong
fa678f893f 直接添加端下一级菜单bugfix 2023-10-09 11:35:58 +08:00
yangsong
a85bddc1de 直接添加端下一级菜单bugfix 2023-10-09 11:35:22 +08:00
yangsong
5d2ff1ad57 直接添加端下一级菜单bugfix 2023-10-09 09:45:42 +08:00
zhansihu
89382818ea feat(auth): 实现根据codes查询有权限用户 2023-10-08 18:05:38 +08:00
yangsong
35d0184fef 直接添加端下一级菜单bugfix 2023-10-08 17:12:39 +08:00
yangsong
e2a100fdd9 生成businessCode代码bug 2023-10-08 15:37:35 +08:00
zhansihu
4486aa8b12 feat(auth): 根据身份查询权限点实现 2023-10-08 11:04:19 +08:00
陈维伟
5c1b8a7d78 rollback mock 2023-10-07 19:25:54 +08:00
陈维伟
77831a46da mock 2023-10-07 17:21:57 +08:00
陈维伟
3ed1e33233 联调:查询审批流表单查看/编辑权限 2023-10-07 17:20:07 +08:00
yangsong
8f6959f3e2 修改明细代码调整 2023-10-07 17:04:00 +08:00
TanJ
611acadbf9 feat: 指量查询权限接口 2023-10-07 15:27:25 +08:00
yangsong
c6bc1dcfc2 获取节点树调整 2023-10-07 14:39:32 +08:00
yangsong
becda42c9e 修改节点类型判断 2023-10-07 10:37:42 +08:00
yangsong
42551bbf38 删除权限点接口 2023-10-07 10:27:31 +08:00
yangsong
659043a546 添加页面控制字段 2023-10-06 16:58:10 +08:00
yangsong
a051b8f1b3 提交申请 2023-10-06 15:45:38 +08:00
yangsong
3511730aaa Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-10-06 14:42:13 +08:00
yangsong
2efd83ee25 添加字典id 2023-10-06 14:42:07 +08:00
陈维伟
1f2e8b8928 添加参数:查询审批流表单查看/编辑权限 2023-10-06 11:44:14 +08:00
yangsong
961cc2307b 明细添加字段 2023-10-06 10:24:05 +08:00
陈维伟
bc988721d9 实现接口:查询审批流表单查看/编辑权限 2023-10-05 10:19:32 +08:00
yangsong
500716e9ec 解决冲突 2023-09-28 18:30:43 +08:00
yangsong
f6aee5bc16 Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointApplyController.java
 2023-09-28 18:28:07 +08:00
yangsong
0b6671476b 获取权限申请摘要 2023-09-28 18:27:03 +08:00
chenwenjian
220e4f58ca feat: 调整updateApplyDetail实现 2023-09-28 17:24:37 +08:00
yangsong
21a4c23d78 解决冲突 2023-09-28 16:32:52 +08:00
yangsong
a80829bbda Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/PermissionPointApplyApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/PermissionPointApplyController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureApplyService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
 2023-09-28 16:31:12 +08:00
yangsong
abe6e05383 修改申请状态 2023-09-28 16:26:04 +08:00
chenwenjian
d27b676188 Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309 2023-09-28 16:13:52 +08:00
chenwenjian
df172f6ba7 feat: 新增权限点申请详情查询和更新接口 2023-09-28 16:13:33 +08:00
yangsong
fe35cc8f50 Merge remote-tracking branch 'origin/hotfix/20230928' into feature/REQ-1309 2023-09-28 14:47:35 +08:00
yangsong
00341e4146 移除已删除权限点 2023-09-28 14:45:56 +08:00
yangsong
f2c0ffeec1 查看申请详情树 2023-09-27 20:42:51 +08:00
yangsong
9e466f621b 流程实例id绑定 2023-09-27 17:34:52 +08:00
陈维伟
43d3b81754 定义接口:查询审批流表单查看/编辑权限 2023-09-27 11:19:28 +08:00
yangsong
b8ba4ab2d8 生成featureCode 2023-09-27 11:04:35 +08:00
yangsong
092abb12a8 生成featureCode 2023-09-26 18:13:16 +08:00
yangsong
f748566f5a spi module提交 2023-09-25 20:06:35 +08:00
zhansihu
d928f54d8b fix(权限点): 兼容path父级不存在 2023-09-22 15:33:13 +08:00
陈维伟
2542153b2c fix bug:添加新成员角色赋予报错 2023-09-21 16:05:48 +08:00
陈维伟
3310fdfd6f 查询角色通用接口,调整角色类型为数组,支持多类型查询 2023-09-20 15:25:09 +08:00
zhansihu
3325b75321 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-19 18:53:04 +08:00
zhansihu
5909b04e27 feature(权限点): 增加BizEx异常处理 2023-09-19 18:52:57 +08:00
陈维伟
02ebffb1ef Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-19 15:58:03 +08:00
陈维伟
32b324a0a0 修改角色重名文案提示 2023-09-19 15:57:55 +08:00
yangsong
79c33ce2f2 代码优化，增加对角色通用权限集存在验证 2023-09-19 14:19:43 +08:00
zhansihu
abf3bd7c0a refactor(权限点): 增加层级校验逻辑；增加删除产品关联 2023-09-19 10:55:58 +08:00
zhansihu
aa870bd7e8 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 18:16:53 +08:00
zhansihu
dc09ced2a9 feature(权限点): 树形查询支持类型查询，参数扩展 2023-09-18 18:16:46 +08:00
wangli
13d561bea2 add - 查询产品列表增加 ID 集合查询 2023-09-18 16:30:48 +08:00
zhansihu
109d244510 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 16:06:06 +08:00
zhansihu
76382d63d3 feature(权限点): 树形查询支持层级参数；字段扩展 2023-09-18 16:05:23 +08:00
wangli
5d3fb61b45 update - 产品表增加一列字典 code 值 2023-09-18 16:01:25 +08:00
yangsong
0eeb386924 获取分组权限点 bugfix 2023-09-18 15:34:38 +08:00
陈维伟
a1d60a09a6 xxl-job环境联通测试完毕,回复角色清洗job逻辑 2023-09-18 15:08:20 +08:00
陈维伟
11d535da2a 添加XxlJobConfig 2023-09-18 14:48:22 +08:00
陈维伟
5a272c98fc 角色清洗job暂时关闭逻辑,验证dev环境连通性 2023-09-18 14:25:38 +08:00
zhansihu
4a6ff5e037 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 13:43:40 +08:00
zhansihu
b24dcbaf0a refactor(权限点): 查询接口增加层级参数 2023-09-18 13:43:34 +08:00
yangsong
1f407110c6 允许例外设置为空 2023-09-18 11:56:18 +08:00
zhansihu
c3750cf92c debug(权限点): 增加树形接口耗时统计 2023-09-18 11:14:48 +08:00
yangsong
fa52425b59 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-18 10:21:39 +08:00
yangsong
ecc03c376d 允许将权限点设置为空 2023-09-18 10:21:29 +08:00
wangli
17b2bc9d75 update - 添加产品重名相关的校验 2023-09-18 10:19:18 +08:00
wangli
7e2cb2d11d update - 添加产品重名相关的校验 2023-09-18 10:13:36 +08:00
陈维伟
572bdcfc49 实现接口:isSuperAdmin 2023-09-16 18:41:40 +08:00
陈维伟
9907742993 fix bug 2023-09-16 18:23:45 +08:00
陈维伟
0b44d32c26 add implements 2023-09-16 18:19:59 +08:00
yangsong
3593a17951 异常处理优化 2023-09-16 18:17:12 +08:00
yangsong
8087854336 异常处理 2023-09-16 17:49:54 +08:00
陈维伟
712cfa0b86 fix bug:npe 2023-09-16 16:13:38 +08:00
yangsong
189e1ffa98 修改异常类型，合并list和page方法 2023-09-16 14:56:20 +08:00
陈维伟
5348476aa7 权限组返回结果添加创建时间和更新时间 2023-09-16 11:01:58 +08:00
yangsong
7a80452c82 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 18:11:17 +08:00
yangsong
8ed88b9813 角色，分组，权限集 名称不能重复验证 2023-09-15 18:11:07 +08:00
陈维伟
08c0d58345 fix bug:删除角色分组 2023-09-15 17:55:38 +08:00
陈维伟
f699a6049f fix bug:selectedOu.size 2023-09-15 17:28:23 +08:00
金海洋
1b72a1c10c feat(server): add /api/saas-role-user/delete api 2023-09-15 16:13:10 +08:00
zhansihu
1644217e75 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 15:08:51 +08:00
zhansihu
0aee92334e fix(权限点): 修正树形顶级展示逻辑 2023-09-15 15:08:45 +08:00
TanJ
17c741869a fix: 添加自然人ID 2023-09-15 14:56:37 +08:00
zhansihu
f3e1ac397e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 14:23:52 +08:00
zhansihu
42ae74b0e2 refactor(权限点): 列表查询增加IDS条件； 
fix(权限点): 修正排序bug
 2023-09-15 14:23:46 +08:00
yangsong
5b0eeb584b codereview bugfix 2023-09-15 14:02:24 +08:00
陈维伟
d7eafc1697 角色数据清洗 saasRoleGroup.sort=1 2023-09-15 10:14:12 +08:00
陈维伟
4eedc3ca04 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-15 10:10:04 +08:00
陈维伟
036960475a 角色数据清洗 saasRoleGroup.workspaceType=6 2023-09-15 10:09:59 +08:00
yangsong
7aa37d7d07 bugfix 2023-09-14 20:49:28 +08:00
陈维伟
599ced9fd2 code review add comment refect 2023-09-14 18:21:16 +08:00
陈维伟
c0334565aa code review add comment refect 2023-09-14 18:13:45 +08:00
陈维伟
e0501daf68 code review add comment refect 2023-09-14 17:57:44 +08:00
金海洋
b219f788aa modify OrganizationalJobConfig update api 2023-09-14 16:52:36 +08:00
金海洋
e6ceb71324 feat(server): add /api/saas-role-user/list api 2023-09-14 16:48:19 +08:00
陈维伟
675e1bd065 code review add comment 2023-09-14 16:19:53 +08:00
zhansihu
9af061131f fix(权限点): 兼容空sort 2023-09-14 16:04:42 +08:00
zhansihu
4710057f44 fix(权限点): 过滤修复 2023-09-14 14:34:30 +08:00
zhansihu
8adbb01be0 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 14:26:41 +08:00
zhansihu
017588b230 refactor(权限点): 代码优化 2023-09-14 14:26:35 +08:00
yangsong
3210aa2d6d package rename 2023-09-14 13:42:33 +08:00
zhansihu
0fc1694edf Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 11:36:59 +08:00
zhansihu
f7ae347b08 refactor(权限点): 排序实现重构；支持新增时重新排序 2023-09-14 11:36:53 +08:00
yangsong
fbd3ac440a 查询角色分组树 bugfix 2023-09-14 11:02:33 +08:00
陈维伟
5aa7d1845d Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-14 10:58:24 +08:00
陈维伟
627a5852c1 查询角色分组接口补充查询参数 2023-09-14 10:58:19 +08:00
TanJ
bd27016a3d feat: roleType移至common供yoke消费 2023-09-14 10:52:57 +08:00
yangsong
80140309ad 删除角色分组 2023-09-14 09:41:31 +08:00
zhansihu
3677cad80e Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 21:06:42 +08:00
zhansihu
37d6de4412 fix(权限点): 修复delegatedType赋值 2023-09-13 21:06:37 +08:00
yangsong
22d6900246 删除例外权限集 2023-09-13 21:04:01 +08:00
yangsong
609aaddc28 例外新增保存 2023-09-13 20:24:24 +08:00
zhansihu
f7fdf994a7 Merge remote-tracking branch 'origin/feature/REQ-1204' into feature/REQ-1102 2023-09-13 19:50:24 +08:00
zhansihu
2919d720ac refactor(权限点): 兼容处理适用单位和节点 2023-09-13 19:49:45 +08:00
陈维伟
b42e6fb0ba 修复权限与权限集对应关系错误问题 2023-09-13 18:12:28 +08:00
TanJ
e756f65631 Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102 2023-09-13 18:01:11 +08:00
TanJ
472f65adfc fix: 指删除role user 报错修复 
同时添加了启动参数
 2023-09-13 18:00:47 +08:00