Commit Graph

1640 Commits (bb23c2a9fab32bf1755a1ee07a97bae9f3ab14de)

Author SHA1 Message Date
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
fit2bot ed82249fd1
perf: asset perm (#9240)
Co-authored-by: feng <1304903146@qq.com>
2022-12-23 19:01:29 +08:00
fit2bot 7530afe368
perf: 翻译 (#9239)
Co-authored-by: feng <1304903146@qq.com>
2022-12-23 15:49:32 +08:00
fit2bot c5edb9981e
perf: rbac tree (#9237)
Co-authored-by: feng <1304903146@qq.com>
2022-12-22 20:09:20 +08:00
Bai ab6518e60e fix: 开启授权规则signal信号监听;解决授权规则变动用户授权树没有即使刷新的问题 2022-12-22 18:56:54 +08:00
fit2bot 1de51a2bfd
perf: asset xpack (#9234)
Co-authored-by: feng <1304903146@qq.com>
2022-12-22 13:50:22 +08:00
ibuler e0e57a71aa pref: 类型树支持资产 2022-12-22 11:34:18 +08:00
ibuler 7ca2fdca89 perf: 修改 platform 搜索 2022-12-21 20:04:49 +08:00
ibuler 0c2a5bc44a fix: 修复搜索资产平台 2022-12-21 19:59:56 +08:00
ibuler df1950d063 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-21 18:37:37 +08:00
ibuler b01ef1585c perf: account secret rbac permission 2022-12-21 18:37:05 +08:00
ibuler 17627390f8 perf: 修改 account 序列号字段 2022-12-21 18:36:15 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228)
Co-authored-by: feng <1304903146@qq.com>
2022-12-21 17:17:54 +08:00
ibuler 63d35ea8a6 perf: 修改资产 model 2022-12-20 20:39:48 +08:00
ibuler 58909ee67d perf: 修改基础 model,继承同一个 2022-12-20 20:23:42 +08:00
Bai 362cfb733c perf: 修改 su-from-accounts API 2022-12-20 16:13:44 +08:00
fit2bot 69b16e4754
perf: asset type xpack (#9218)
Co-authored-by: feng <1304903146@qq.com>
2022-12-19 11:35:50 +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 11a58dc7ad perf: k8s tree proxy 2022-12-16 10:52:08 +08:00
feng d7a793b4c4 perf: 修改k8s tree 2022-12-15 18:47:54 +08:00
fit2bot 69fe0b07fd
perf: k8s tree (#9214)
Co-authored-by: feng <1304903146@qq.com>
2022-12-15 16:08:19 +08:00
ibuler 615a1ddc96 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-15 16:03:21 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +08:00
feng 840ca02223 perf: del redundant macos 2022-12-15 15:21:51 +08:00
Eric d60f9a7c69 perf: web selector 默认值修改 2022-12-14 17:39:22 +08:00
feng 408c6c568a perf: account backup 2022-12-12 12:33:45 +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 a767c208b3 perf: 优化 get_all_node_keys 方法 2022-12-09 13:38:30 +08:00
Bai 4f5cc56b00 perf: 优化 UserPermTreeUtil 逻辑(进行中) 2022-12-09 13:38:30 +08:00
Bai 8beb1b81cf fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类 2022-12-09 11:12:56 +08:00
Bai beac2a1514 perf: 优化获取账号 su-from-accounts 时,不包含自己和以自己为 su-from 的账号 2022-12-08 13:37:35 +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 66bdc375df Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 19:30:48 +08:00
Bai 58131a2b68 fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题;
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时,会默认先创建 spm 值,
后端调用 get_object 方法时,使用的queryset,就是spm所对应的queryset,
而 detail=True, 查询的值是当前 account_id,不在 queryset 中,
所以会导致调用父类的 get_object 方法报错,对象找不到
2022-12-07 19:26:28 +08:00
ibuler a27b43107c Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:59:28 +08:00
ibuler 0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
Bai d252ee41ed Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-07 18:38:12 +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
ibuler 6a1c5aba12 perf: 修改一些翻译 2022-12-07 17:24:30 +08:00
ibuler da36ce9dfd perf: merge connect token rdp option 2022-12-07 15:13:32 +08:00
ibuler dbee3ed30d feat: connect token 添加 Rdp options 2022-12-07 15:09:01 +08:00
Bai 6233e2b3de perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty 2022-12-06 19:41:26 +08:00
Bai 29fd6ee8c9 perf: Account su_from 返回使用 ObjectRelatedField 2022-12-06 18:54:13 +08:00
Bai 71e76e5075 feat: 添加su-from-accountsAPI 2022-12-06 17:43:33 +08:00
jiangweidong 803d68f3fe feat: 增加clickhouse 2022-12-06 17:13:37 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160)
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
2022-12-06 11:03:14 +08:00
ibuler daf279304a perf: 修改完冲突了 2022-12-05 18:54:12 +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