github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,386 Commits
66 Branches
247 Tags
108 MiB
Commit Graph

764 Commits (3172e954a8f5973e804de391f5e64385300be3fb)

Author SHA1 Message Date
ibuler 4bd913b585 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:00:11 +08:00
Bai 4f8e0fc28e fix: 修改授权树API，连续刷新3次转为强制刷新；修改异步授权树一级节点的资产显示问题； 2022-12-23 13:19:38 +08:00
ibuler 047ba34238 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 11:12:31 +08:00
ibuler ffa30fdb69 perf: 修改 Logo 2022-12-23 11:11:56 +08:00
Bai 3443b06a28 fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题 2022-12-22 19:17:52 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
Bai c645ca9aea fix: 修改点击我的授权树节点报错的问题 2022-12-22 17:43:03 +08:00
Bai d4e215aeaa fix: 修复luna页面资产树加载不出来的问题 2022-12-21 18:00:50 +08:00
fit2bot 34cc3b233d
refactor: 重构用户授权资产查询工具(重构中..) (#9225) 
* refactor: 重构用户授权资产查询工具(重构中..)

* perf: 修改 get_perm_nodes_assets 名称

* refactor: 优化用户授权节点查询工具; 删除UnionQuerySet工具

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-21 17:36:44 +08:00
feng 510ca9a5b8 perf: k8s tree 2022-12-21 17:32:55 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-21 17:17:54 +08:00
Bai 5198ac1cc0 perf: 修改 UserAssetGrantedTreeNodeRelation id 为 AutoField 2022-12-21 15:16:54 +08:00
ibuler 10f4a0d67e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-20 20:25:14 +08:00
ibuler 58909ee67d perf: 修改基础 model，继承同一个 2022-12-20 20:23:42 +08:00
feng 21d6243b61 perf: api doc 2022-12-20 19:18:39 +08:00
feng dddff03336 perf: asset tree 2022-12-20 14:53:25 +08:00
Bai ba4d222eda fix: 解决 nodes-with-assets/tree/ API 异常的问题 2022-12-20 11:25:44 +08:00
fit2bot 92a198c00b
refactor: 重构重建用户授权树工具 (#9219) 
* perf: 优化 <UserGrantedTreeBuildUtils> 用户授权树构建工具

* feat: 完成计算授权节点资产数量

* refactor: 重构重建用户授权树工具

* merge: v3

Co-authored-by: Bai <baijiangjie@gmail.com>
 2022-12-19 16:04:58 +08:00
ibuler 26fa1f6f08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-16 15:54:29 +08:00
ibuler d040162d86 perf: 修改 session 字段，添加 Comment 2022-12-16 15:53:59 +08:00
feng d7a793b4c4 perf: 修改k8s tree 2022-12-15 18:47:54 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +08:00
Eric acfce4961c fix: 修复用户组织树问题 2022-12-14 18:17:25 +08:00
Eric d60f9a7c69 perf: web selector 默认值修改 2022-12-14 17:39:22 +08:00
fit2bot c861f390c7
perf: k8s account ignore (#9188) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-12 11:43:19 +08:00
Bai 26d9cdc50d perf: 优化用户授权树工具类存放目录 user_perm_tree 文件中 2022-12-09 14:03:00 +08:00
Bai 5e5061a825 perf: 优化 UserPermTreeExprireUtil 2022-12-09 13:38:30 +08:00
Bai 89f89532e7 perf: 优化 convert_to_queryset 方法 2022-12-09 13:38:30 +08:00
Bai 1679efe2c9 refactor: 重构优化用户授权树工具类和用户授权树过期条件处理逻辑 <UserPermTreeRefreshUtil> <UserPermTreeExpireUtil> 2022-12-09 13:38:30 +08:00
Bai 4f5cc56b00 perf: 优化 UserPermTreeUtil 逻辑(进行中) 2022-12-09 13:38:30 +08:00
fit2bot e5afbd4118
perf: k8s tree api (#9169) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-07 23:55:56 +08:00
Bai 6cda28c63d perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset; 2022-12-07 18:38:03 +08:00
Bai bf5da83008 perf: 修改授权 API Name 2022-12-06 19:53:36 +08:00
ibuler 2168610ffe perf: 修改合并引起的 migrations 依赖问题 2022-12-05 16:07:14 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
ibuler 2cf3a21d27 perf: 修改校验权限 2022-12-02 20:33:32 +08:00
ibuler 2d771eedc1 perf: 优化用户授权 api 2022-12-02 13:15:03 +08:00
Bai d5d770e4ac Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 12:03:08 +08:00
Bai 592d79c0f8 perf: 合并授权规则用户相关的 API URL，统一使用 /<str:user>/ 格式 2022-12-01 12:02:20 +08:00
Eric d198dfcba9 perf: granted asset add specific field 2022-12-01 00:36:02 +08:00
Eric 142348b055 perf: 增加资产过滤 2022-11-30 18:16:52 +08:00
ibuler 307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +08:00
ibuler 5e503ec5b8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-25 23:11:28 +08:00
ibuler 0f35b3dd58 pref: 修改 connect token 2022-11-25 23:09:55 +08:00
Bai 99f5c02d84 perf: 获取用户授权的账号返回 has_username 字段 2022-11-24 17:04:27 +08:00
Bai 4574161009 fix: 修复获取授权规则的账号列表为空的问题 2022-11-24 16:44:15 +08:00
ibuler abfd472a0a perf: 修改 connect token 2022-11-23 16:11:17 +08:00
ibuler 075cadb1ab merge: with remote 2022-11-22 21:56:30 +08:00
ibuler 779161d79a perf: 修改 connection token 2022-11-22 21:54:40 +08:00
Jiangjie.Bai d543c3efe7 fix: 修复 favorite-assets Serializer 缺少 protocols 字段的问题 2022-11-22 11:05:52 +08:00