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
yangsong
1a351cee20 报错修改 2023-10-20 09:51:12 +08:00
yangsong
c437ace6d7 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
 2023-10-20 09:50:05 +08:00
yangsong
7b0be4dfd2 创建机构管理员账户角色 2023-10-20 09:48:33 +08:00
陈维伟
2bc8895177 修改dev环境企业权限模板id 2023-10-19 19:53:29 +08:00
金海洋
8309192a31 feat(server): modify queryByIdentityIdType 2023-10-19 19:26:23 +08:00
陈维伟
68832ac6ad 屏蔽测试方法 2023-10-19 19:09:29 +08:00
金海洋
542443fd25 feat(server): 修改用户角色列表接口 2023-10-19 18:02:40 +08:00
张弘昊
2defb39906 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 17:25:18 +08:00
张弘昊
a009656d5f 通过名称获取角色 2023-10-19 17:25:12 +08:00
陈维伟
f5ea598344 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 16:59:00 +08:00
陈维伟
89103ca983 dev环境CMS角色清洗一轮执行完毕 2023-10-19 16:58:54 +08:00
zhansihu
707e748a64 refactor(role-query): 改变角色查询逻辑 2023-10-19 16:26:39 +08:00
zhansihu
24f30d7fd2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 15:38:20 +08:00
zhansihu
70044ff732 refactor(role-query): 增加参建单位资质条件 2023-10-19 15:38:09 +08:00
yangsong
b24927820a 创建机构用户权限 2023-10-19 13:54:38 +08:00
陈维伟
2d254e93d2 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 11:42:56 +08:00
陈维伟
722c2488b3 补充清除历史日志逻辑 2023-10-19 11:41:35 +08:00
zhansihu
8cff1d1338 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 2023-10-19 10:16:12 +08:00
zhansihu
7009b40444 feature(permission-query): 权限检查接口 2023-10-19 10:16:06 +08:00
张弘昊
f8bc855e50 Merge remote-tracking branch 'origin/feature/REQ-1502-zhh' into feature/REQ-1502 2023-10-19 10:01:13 +08:00
张弘昊
33d1b8fddd 获取权限码 2023-10-19 09:51:10 +08:00
陈维伟
4a7f72dd09 添加备注 2023-10-18 21:14:50 +08:00
陈维伟
d26d4e7064 更新查询企业通用角色逻辑 2023-10-18 20:31:42 +08:00
陈维伟
acf37b5560 CMS数据清洗job基础逻辑 2023-10-18 19:01:59 +08:00
yangsong
df12ccdd8e Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
 2023-10-18 17:02:57 +08:00
yangsong
adbdf51b80 删除用户角色 2023-10-18 17:01:21 +08:00
zhansihu
eb7d2e3005 refactor(role-query): test调整 2023-10-18 16:38:29 +08:00
zhansihu
a05bd02bf3 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:27:18 +08:00
zhansihu
ea4883c6b5 Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
 2023-10-18 16:24:56 +08:00
张弘昊
f757421375 通过名字获取角色信息 2023-10-18 16:24:56 +08:00
zhansihu
d14cb28066 feature(role-query): 角色分页查询接口 2023-10-18 16:22:53 +08:00
wangli
10cdd20b93 add - 新增通过工作台 id 查询权限点 2023-10-18 16:20:04 +08:00
张弘昊
2d366e4500 创建超级管理员角色 2023-10-18 15:45:36 +08:00
张弘昊
a05b3b57a5 创建超级管理员角色 2023-10-18 14:49:41 +08:00
张弘昊
0d5453efdf Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-18 14:47:56 +08:00
张弘昊
692a0a0e66 创建超级管理员角色 2023-10-18 14:47:00 +08:00
yangsong
f967f9d736 查询角色列表bugfix 2023-10-18 11:13:28 +08:00
TanJ
cd4751ebce feat: terminal 
terminal查询逻辑调整
 2023-10-18 10:56:58 +08:00
金海洋
0161d655c0 feat(server): 删除 deleteUserRolesOfWorkspace 接口 2023-10-18 09:46:47 +08:00
yangsong
b05cc3a128 接口迁移，删除管理员角色参数调整 2023-10-17 19:22:29 +08:00
yangsong
6999302f6f Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502 
# Conflicts:
#	tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
 2023-10-17 19:20:59 +08:00
yangsong
38b200e600 接口迁移，删除管理员角色参数调整 2023-10-17 19:17:18 +08:00
金海洋
cb6aa953e1 feat(server): 增加删除工作台下的所有人员与平台角色接口 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:
1. 增加删除工作台下的所有人员与平台角色接口
 2023-10-17 18:55:27 +08:00
yangsong
31958870c9 接口迁移，接口定义 2023-10-17 16:59:20 +08:00
zhansihu
edba38383b refactor(permission-point): 移除适用单位类型和适用节点类型 2023-10-17 16:53:26 +08:00
zhansihu
1569262201 feature(saas-auth): 定义新的权限查人接口 2023-10-17 16:48:23 +08:00
TanJ
036809191c feat: WorkspaceJoinType 
使用int入参
 2023-10-17 14:32:37 +08:00
金海洋
25d6fb13a9 feat(server): 增加移除某个人在某个工作台的所有角色(除超管) 
https://jira.axzo.cn/browse/REQ-1502?goToView=1

modify:1. 增加 /api/saas-role-user/delete-user-role 接口
 2023-10-17 13:39:17 +08:00
TanJ
92e25beae1 fix(1502): 获取产品菜单逻辑修复 2023-10-17 13:34:34 +08:00
TanJ
2a72666dfc feat: 优化通过工作台查询产品逻辑 2023-10-17 11:04:24 +08:00
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