github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,881 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

115 Commits (45bac09dc73944be65399cab4b92883d9fc316a9)

Author SHA1 Message Date
ibuler a2d6e41816 perf: labels getter and setter for inherite model 2024-01-16 15:00:46 +08:00
ibuler 15ac81a422 perf: 优化标签绑定，仅绑定到资产上 2024-01-03 17:08:15 +08:00
fit2bot 8291a81efd
perf: 支持全局的 labels (#12043) 
* perf: 支持全局的 labels

* perf: stash

* stash

* stash

* stash

* stash

* perf: 优化 labels

* stash

* perf: add debug sql

* perf: 修改 labels

* perf: 优化提交

* perf: 优化提交 labels

* perf: 基本完成

* perf: 完成 labels 搜索

* perf: 优化 labels

* perf: 去掉不用 debug

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-12-05 11:16:34 +08:00
fit2bot 26a18a1f5c
perf: 批量创建资产 账号格式错误提醒 (#11909) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 13:44:24 +08:00
ibuler 9b019e45ae perf: 修复协议丢失的问题 2023-10-18 15:40:52 +08:00
fit2bot b313598227
fix: 修复账号批量添加模版账号时name没同步过来，资产创建时使用模版账号没有切换自，资产克隆时生成的账号没有切换自 (#11877) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-17 19:15:46 +08:00
fit2bot e1278360af
fix: 资产创建失败 (#11824) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 19:46:04 +08:00
fit2bot c0de27ff7a
perf: 资产批量更新平台字段，根据平台约束协议自动生效 (#11818) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-12 18:11:51 +08:00
ibuler affa562384 perf: 优化禁用用户 2023-10-10 19:00:00 +08:00
Bai 77944cc91b fix: 修复创建资产 is_valid 使用kw参数 2023-07-27 10:21:22 +08:00
ibuler 806baeb136 perf: 修复批量更新资产导致的错误 2023-07-25 14:45:24 +08:00
ibuler b4b9c805ff perf: 修改支持 Django4 2023-07-24 11:52:25 +08:00
fit2bot 19b91a6c1f
perf: 修复资产导入账号模版失败问题 导入文件不区分大小写 (#11031) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-20 14:57:51 +08:00
fit2bot de4ef7d1b5
perf: GPT资产修改节点导致资产协议变多 (#11021) 
Co-authored-by: feng <1304903146@qq.com>
 2023-07-19 19:00:15 +08:00
ibuler 7d111b6efb perf: 优化自定义平台和 applet 导入 2023-05-31 16:48:50 +08:00
fit2bot a19586f8b8
perf: perm user asset add labels (#10339) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-25 14:48:09 +08:00
feng f85daa088f perf: 创建资产 nodes 可为空 默认 default 2023-04-21 14:58:11 +08:00
ibuler dac708f952 perf: 优化 api doc 报错 2023-04-20 15:47:50 +08:00
fit2bot fc4a77df1a
fix: 账号导入500 (#10255) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-19 10:57:38 +08:00
ibuler 8b98bbddaa perf: custom fields 仅custom 类型资产支持 2023-04-18 17:07:01 +08:00
ibuler 5921b2ee8f perf: 修改默认节点 2023-04-18 16:29:41 +08:00
fit2bot cff4309b03
fix: export assets (#10224) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-17 15:42:46 +08:00
fit2bot 2b00e6e3a1
fix: 修复资产列表 mini 时报错 (#10220) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-17 15:10:34 +08:00
jiangweidong e12b832992
perf: 关闭SFTP后，luna界面不显示相应选项 (#10186) 
* perf: 关闭SFTP后，luna界面不显示相应选项

* perf: 修改默认值

* perf: 增加资产协议冗余字段，减少关联查询

* perf: 修改

* perf: 优化

* perf: 精简

* perf: 删掉空格

* perf: 修改继承类
 2023-04-13 17:26:24 +08:00
fit2bot 4654756966
fix: 修复账号克隆 500 (#10192) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-13 14:20:07 +08:00
fit2bot 1248458451
perf: 优化支持 choices (#10151) 
* perf: 支持自定义类型资产

* perf: 改名前

* perf: 优化支持 choices

* perf: 优化自定义资产

* perf: 优化资产的详情

* perf: 修改完成自定义平台和资产

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-04-10 10:57:44 +08:00
fit2bot c5340b5adc
perf: 修改 account (#10088) 
* perf: 优化账号创建策略

* perf: 修改账号

* perf: 修改 account

* perf: 修改 account

* perf: 修改批量创建

* perf: 修改账号批量创建

* perf: 继续优化账号批量添加

* perf: 优化创建 accounts 的结果

* perf: 优化账号批量返回的格式

* perf: 优化账号

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-03 18:18:31 +08:00
Bai 66d368f882 fix: 修改nodes_display required = False 2023-03-24 17:11:03 +08:00
Bai 5d022c7056 fix: 修复资产导入支持填写节点路径 2023-03-23 16:01:19 +08:00
fit2bot f7ae23f7d9
perf: 导入资产账号模版api优化 (#10038) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-03-22 18:35:23 +08:00
ibuler cac59db1ec perf: 设置资产账号的默认值，方便导入 2023-03-21 12:43:54 +08:00
ibuler 2b7f90349c perf: 优化资产平台的获取 2023-03-15 14:14:48 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
ibuler fa3bfceddc perf: 优化导入导出 
perf: remove debug

perf: 修改账号导入导出

perf: 去掉一些 debug
 2023-03-10 19:23:49 +08:00
fit2bot 3658ecce0c
perf: 修改 ssh key with pass 报错 (#9917) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-10 16:04:48 +08:00
Jiangjie.Bai 0a374db606
fix: 修复文件导出 {"": True"} 问题 (#9729) 2023-02-23 19:14:58 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 11:04:29 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616) 
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 21:11:06 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
fit2bot e66168dfa4
perf: account secret 加密 (#9570) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 20:16:01 +08:00
fit2bot 10d776f7e5
perf: account name required (#9533) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 11:37:18 +08:00
ibuler 136bec94ca perf: merge with dev 2023-02-10 15:38:40 +08:00
Bai 4c96d6935a fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送 2023-02-10 11:14:05 +08:00
ibuler 37a52c420f perf: 优化并发处理 2023-02-09 20:48:25 +08:00
Bai 4f6a17290a fix: 修复创建资产时账号禁用不生效的问题 2023-02-09 12:30:28 +08:00
Bai b41d30dbac fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验) 2023-02-07 16:00:36 +08:00