168 Commits

Author SHA1 Message Date
ibuler
389f94d672 perf: 修改 assets serializer 支持 accounts template 2023-04-18 19:12:26 +08:00
老广
996690fc02 Merge pull request #10235 from jumpserver/pr@dev@perf_asset_set_default_nodes
perf: custom fields 仅custom 类型资产支持
2023-04-18 17:18:53 +08:00
fit2bot
cf197f7efc perf: 创建资产通过账号模版创建账号 (#10234)
Co-authored-by: feng <1304903146@qq.com>
2023-04-18 17:03:49 +08:00
ibuler
5921b2ee8f perf: 修改默认节点 2023-04-18 16:29:41 +08:00
fit2bot
5a34372ca5 perf: 批量创建账号 没解密 (#10226)
Co-authored-by: feng <1304903146@qq.com>
2023-04-17 17:46:10 +08:00
fit2bot
b3b7575b0c fix: 批量更新资产账号 错误 secret (#10221)
Co-authored-by: feng <1304903146@qq.com>
2023-04-17 15:07:34 +08:00
Jiangjie.Bai
9109a5e6a2 Merge pull request #10213 from jumpserver/dev
v3.2.0 rc2
2023-04-14 18:33:00 +08:00
jiangweidong
690e01cb78 feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret) (#9947)
* feat: 支持部分资源的自定义自动化任务(Ping/VerifyAccount/ChangeSecret)

* perf: 去掉无用的属性

* perf: 优化自定义改密逻辑

* feat: 支持ssh_key认证

* perf: 去掉无用注释

* perf: 优化

* perf: 优化逻辑

* perf: 优化标题

* perf: 去掉一些无用的函数

* perf: 优化helptext
2023-04-14 18:31:09 +08:00
feng
31653cab11 perf: 单独推送账号 2023-04-14 16:22:54 +08:00
Jiangjie.Bai
68351b1c39 Merge pull request #10196 from jumpserver/dev
v3.2.0 rc1
2023-04-13 19:21:05 +08:00
Bai
21da805e78 fix: fix conflicts 2023-04-13 19:20:18 +08:00
fit2bot
1eb8e40d3e feat: 账号推送附加参数 (#10080)
* feat: 账号推送附加参数

* perf: 通过节点 资产 过滤平台api

* perf: push automation params

* perf: 修改playbook

* perf: params serializer

* perf: 账号推送playbook 调整

* perf: Automation serializer add params field

* perf: params 非必填

* perf: 添加is_params 给前端判断

* perf: is_params bool

* perf: 修改push account ansible逻辑

* perf: 修改获取push_kwargs方法

* perf: platform migrate

* perf: 修改api

* perf: 单个推送

* perf: push account

* perf: 修改asset auto_config

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
2023-04-13 19:02:04 +08:00
fit2bot
4654756966 fix: 修复账号克隆 500 (#10192)
Co-authored-by: feng <1304903146@qq.com>
2023-04-13 14:20:07 +08:00
fit2bot
30b89e5cc9 perf: 账号模版更新 (#10184)
Co-authored-by: feng <1304903146@qq.com>
2023-04-12 17:59:13 +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
e34fbce082 perf: patch account 400 (#10153)
Co-authored-by: feng <1304903146@qq.com>
2023-04-06 19:53:01 +08:00
fit2bot
7c1e92c787 fix: 更新账号 跳过name检查 (#10136)
Co-authored-by: feng <1304903146@qq.com>
2023-04-04 16:04: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
feng
1ac2fec13f feat: 收集账号 可选同步表 2023-03-27 14:13:44 +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
fit2bot
ed4a4ceca1 perf: 批量创建账号 定义创建账号策略 忽略或抛出错误 (#10028)
Co-authored-by: feng <1304903146@qq.com>
2023-03-22 11:09:48 +08:00
fit2bot
69cd7bce17 perf: 批量创建账号时,跳过unique检查 不去创建 (#9966)
Co-authored-by: feng <1304903146@qq.com>
2023-03-20 15:45:21 +08:00
ibuler
12db64ea18 perf: 优化导入导出 2023-03-17 18:44:21 +08:00
Bai
0747cf7c5e fix: 修复导出账号历史翻译信息 2023-03-16 16:40:53 +08:00
Bai
93a7cee4de fix: 修复导出账号历史翻译信息 2023-03-16 11:18:41 +08:00
fit2bot
ed70432016 fix: 账号模版创建带密码的密钥之后无法添加到主机 (#9927)
Co-authored-by: feng <1304903146@qq.com>
2023-03-13 15:46:17 +08:00
fit2bot
b3851adfe7 perf: translate (#9730)
Co-authored-by: feng <1304903146@qq.com>
2023-02-23 19:35:10 +08:00
ibuler
d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
Bai
d4435799ac fix: 授权规则账号列表返回asset.auto_info字段 2023-02-23 11:45:56 +08:00
老广
0b1f6e2606 Merge pull request #9693 from jumpserver/pr@dev@perf_accounts_version
perf: 优化账号历史
2023-02-22 20:38:52 +08:00
fit2bot
b83667bbd5 perf: celery task and add org single (#9698)
Co-authored-by: feng <1304903146@qq.com>
2023-02-22 20:31:20 +08:00
ibuler
5d8d0a320b perf: 优化账号历史 2023-02-22 17:58:00 +08:00
fit2bot
7ceb27301b perf: automation task name validate (#9690)
Co-authored-by: feng <1304903146@qq.com>
2023-02-22 16:23:18 +08:00
ibuler
6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
ibuler
0996b1fbf5 merge: with dev 2023-02-22 11:27:53 +08:00
ibuler
4c233cfb69 perf: 优化 account,去掉版本好 2023-02-22 11:18:42 +08:00
fit2bot
b9dcce5c51 fix: 资产更新没有账号及自动化任务更新name (#9679)
Co-authored-by: feng <1304903146@qq.com>
2023-02-22 11:04:29 +08:00
fit2bot
b41880d4f2 perf: 自动化name 唯一键 校验 (#9668)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 18:31:42 +08:00
fit2bot
266e7e0dd7 perf: change secret is_active (#9667)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 17:54:59 +08:00
ibuler
82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
fit2bot
c8e1660f7e perf: windows not ssh automation (#9658)
Co-authored-by: feng <1304903146@qq.com>
2023-02-21 11:36:17 +08:00
ibuler
c9534bb9c4 perf: 优化账号推送 2023-02-20 23:50:33 +08:00
fit2bot
ca22b08cde perf: account update (#9656)
Co-authored-by: feng <1304903146@qq.com>
2023-02-20 20:22:26 +08:00
ibuler
37c54e976f perf: 优化 tasks 2023-02-20 18:00:29 +08:00
ibuler
9644d8b1bc fix: 修复 ansible 网关问题 2023-02-20 16:20:03 +08:00
Bai
90813d7690 fix: 修改翻译 2023-02-20 15:24:43 +08:00
ibuler
a63709002d perf: 优化 gateway 返回情况 2023-02-16 16:51:42 +08:00
fit2bot
b8c872c68e perf: account cannot be modified (#9585)
Co-authored-by: feng <1304903146@qq.com>
2023-02-16 15:53:45 +08:00
fit2bot
ea7d3c0651 perf: dashboard user amount (#9582)
Co-authored-by: feng <1304903146@qq.com>
2023-02-16 14:27:54 +08:00
fit2bot
e66168dfa4 perf: account secret 加密 (#9570)
Co-authored-by: feng <1304903146@qq.com>
2023-02-15 20:16:01 +08:00